Merge pull request #661 from herby/Amd-AMD-inconsistency-fix

defaultAMDNamespace -> defaultAmdNamespace

bin/amber-cli.js

@@ -1336,7 +1336,7 @@ function AMDBrik(brikz, st) {
 	this.__init__ = function () {
 		st.amdRequire = st.amdRequire || null;
 		st.defaultTransportType = st.defaultTransportType || "amd";
-		st.defaultAMDNamespace = st.defaultAMDNamespace || "amber_core";
+		st.defaultAmdNamespace = st.defaultAmdNamespace || "amber_core";
 	};
 }
 
@@ -1377,7 +1377,7 @@ define("amber_vm/smalltalk", ["require", "module", "./boot"], function (require,
 	smalltalk.amdRequire = require;
 //    var config = module.config && module.config();
 //    if (config) {
-//		smalltalk.defaultAMDNamespace = config.defaultNamespace;
+//		smalltalk.defaultAmdNamespace = config.defaultNamespace;
 //    }
     return  smalltalk;
 });
@@ -17037,11 +17037,11 @@ fn: function (){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
 var $1;
-$1=self._at_("defaultAMDNamespace");
+$1=self._at_("defaultAmdNamespace");
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"defaultAmdNamespace",{},smalltalk.Smalltalk)})},
 args: [],
-source: "defaultAmdNamespace\x0a\x09^ self at: 'defaultAMDNamespace'",
+source: "defaultAmdNamespace\x0a\x09^ self at: 'defaultAmdNamespace'",
 messageSends: ["at:"],
 referencedClasses: []
 }),
@@ -17054,10 +17054,10 @@ category: 'accessing amd',
 fn: function (aString){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
-self._at_put_("defaultAMDNamespace",aString);
+self._at_put_("defaultAmdNamespace",aString);
 return self}, function($ctx1) {$ctx1.fill(self,"defaultAmdNamespace:",{aString:aString},smalltalk.Smalltalk)})},
 args: ["aString"],
-source: "defaultAmdNamespace: aString\x0a\x09self at: 'defaultAMDNamespace' put: aString",
+source: "defaultAmdNamespace: aString\x0a\x09self at: 'defaultAmdNamespace' put: aString",
 messageSends: ["at:put:"],
 referencedClasses: []
 }),

cli/index.html

@@ -22,7 +22,7 @@
         ["amber/devel",
             "amber_cli/AmberCli" ],
         function (smalltalk) {
-            smalltalk.defaultAMDNamespace = 'amber_cli';
+            smalltalk.defaultAmdNamespace = 'amber_cli';
             smalltalk.initialize();
             smalltalk.Browser._openOn_(smalltalk.AmberCli);
         }

helios.html

@@ -20,7 +20,7 @@
                           return 'Do you want to close Amber? All uncommitted changes will be lost.';
                       };
 
-                      smalltalk.defaultAMDNamespace = "amber_core";
+                      smalltalk.defaultAmdNamespace = "amber_core";
                       smalltalk.initialize();
                   }
           );

index.html

@@ -14,7 +14,7 @@
     require(
         ["amber/devel"],
         function (smalltalk) {
-            smalltalk.defaultAMDNamespace = "amber_core";
+            smalltalk.defaultAmdNamespace = "amber_core";
             smalltalk.initialize();
 
             smalltalk.Browser._open()

js/Kernel-Infrastructure.js

@@ -2027,11 +2027,11 @@ fn: function (){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
 var $1;
-$1=self._at_("defaultAMDNamespace");
+$1=self._at_("defaultAmdNamespace");
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"defaultAmdNamespace",{},smalltalk.Smalltalk)})},
 args: [],
-source: "defaultAmdNamespace\x0a\x09^ self at: 'defaultAMDNamespace'",
+source: "defaultAmdNamespace\x0a\x09^ self at: 'defaultAmdNamespace'",
 messageSends: ["at:"],
 referencedClasses: []
 }),
@@ -2044,10 +2044,10 @@ category: 'accessing amd',
 fn: function (aString){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
-self._at_put_("defaultAMDNamespace",aString);
+self._at_put_("defaultAmdNamespace",aString);
 return self}, function($ctx1) {$ctx1.fill(self,"defaultAmdNamespace:",{aString:aString},smalltalk.Smalltalk)})},
 args: ["aString"],
-source: "defaultAmdNamespace: aString\x0a\x09self at: 'defaultAMDNamespace' put: aString",
+source: "defaultAmdNamespace: aString\x0a\x09self at: 'defaultAmdNamespace' put: aString",
 messageSends: ["at:put:"],
 referencedClasses: []
 }),

st/Kernel-Infrastructure.st

@@ -800,11 +800,11 @@ amdRequire
 !
 
 defaultAmdNamespace
-	^ self at: 'defaultAMDNamespace'
+	^ self at: 'defaultAmdNamespace'
 !
 
 defaultAmdNamespace: aString
-	self at: 'defaultAMDNamespace' put: aString
+	self at: 'defaultAmdNamespace' put: aString
 ! !
 
 !Smalltalk methodsFor: 'classes'!

support/boot.js

@@ -1057,7 +1057,7 @@ function AMDBrik(brikz, st) {
 	this.__init__ = function () {
 		st.amdRequire = st.amdRequire || null;
 		st.defaultTransportType = st.defaultTransportType || "amd";
-		st.defaultAMDNamespace = st.defaultAMDNamespace || "amber_core";
+		st.defaultAmdNamespace = st.defaultAmdNamespace || "amber_core";
 	};
 }
 

support/smalltalk.js

@@ -3,7 +3,7 @@ define("amber_vm/smalltalk", ["require", "module", "./boot"], function (require,
 	smalltalk.amdRequire = require;
 //    var config = module.config && module.config();
 //    if (config) {
-//		smalltalk.defaultAMDNamespace = config.defaultNamespace;
+//		smalltalk.defaultAmdNamespace = config.defaultNamespace;
 //    }
     return  smalltalk;
 });