Merge commit '657ba49364fc81f05b84c486388ba749f640d9bb'

Conflicts:
	js/amber.js

js/Kernel-Collections.deploy.js

@@ -2083,6 +2083,17 @@ return self;}
 }),
 smalltalk.Symbol);
 
+smalltalk.addMethod(
+unescape('_asJSON'),
+smalltalk.method({
+selector: unescape('asJSON'),
+fn: function (){
+var self=this;
+return smalltalk.send(smalltalk.send(self, "_asString", []), "_asJSON", []);
+return self;}
+}),
+smalltalk.Symbol);
+
 
 smalltalk.addMethod(
 unescape('_lookup_'),

js/Kernel-Collections.js

@@ -2973,6 +2973,22 @@ referencedClasses: []
 }),
 smalltalk.Symbol);
 
+smalltalk.addMethod(
+unescape('_asJSON'),
+smalltalk.method({
+selector: unescape('asJSON'),
+category: 'converting',
+fn: function (){
+var self=this;
+return smalltalk.send(smalltalk.send(self, "_asString", []), "_asJSON", []);
+return self;},
+args: [],
+source: unescape('asJSON%0A%09%5Eself%20asString%20asJSON'),
+messageSends: ["asJSON", "asString"],
+referencedClasses: []
+}),
+smalltalk.Symbol);
+
 
 smalltalk.addMethod(
 unescape('_lookup_'),

js/amber.js

@@ -205,8 +205,12 @@ amber = (function() {
 	};
 
 	function loadJSViaJQuery(url, callback) {
-		$.ajaxSetup({cache: true});
-		$.getScript(jsToLoad[0], callback);
+		$.ajax({
+			dataType: "script",
+			url: jsToLoad[0],
+			cache: deploy,
+			success: callback
+		});
 	};
 
 	function writeScriptTag(src) {

js/init.js

@@ -1,6 +1,5 @@
 smalltalk.init(smalltalk.Object);
 smalltalk.classes()._do_(function(each) {
-	console.log(each.className); 
 	each._initialize()});
 
 /* Similar to jQuery(document).ready() */

st/Kernel-Collections.st

@@ -1017,6 +1017,10 @@ asJavascript
 
 asSelector
 	^self asString asSelector
+!
+
+asJSON
+	^self asString asJSON
 ! !
 
 !Symbol methodsFor: 'copying'!