Browse Source

Option {vm=>transport}.defaultAmdNamespace

Herbert Vojčík 10 years ago
parent
commit
f4bbaae5c5
6 changed files with 12 additions and 12 deletions
  1. 1 1
      cli/index.html
  2. 1 1
      helios.html
  3. 1 1
      index.html
  4. 4 4
      js/Kernel-Infrastructure.js
  5. 2 2
      st/Kernel-Infrastructure.st
  6. 3 3
      support/helpers.js

+ 1 - 1
cli/index.html

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

+ 1 - 1
helios.html

@@ -20,7 +20,7 @@
                           return 'Do you want to close Amber? All uncommitted changes will be lost.';
                       };
 
-                      smalltalk.initialize({'vm.defaultAmdNamespace': "amber_core"});
+                      smalltalk.initialize({'transport.defaultAmdNamespace': "amber_core"});
 					  smalltalk.globals.HLManager._setup();
                   }
           );

+ 1 - 1
index.html

@@ -14,7 +14,7 @@
     require(
         ["amber/devel"],
         function (smalltalk) {
-            smalltalk.initialize({'vm.defaultAmdNamespace': "amber_core"});
+            smalltalk.initialize({'transport.defaultAmdNamespace': "amber_core"});
 
             smalltalk.globals.Browser._open();
         }

+ 4 - 4
js/Kernel-Infrastructure.js

@@ -2734,11 +2734,11 @@ fn: function (){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
 var $1;
-$1="vm.defaultAmdNamespace"._settingValue();
+$1="transport.defaultAmdNamespace"._settingValue();
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"defaultAmdNamespace",{},globals.SmalltalkImage)})},
 args: [],
-source: "defaultAmdNamespace\x0a\x09^ 'vm.defaultAmdNamespace' settingValue",
+source: "defaultAmdNamespace\x0a\x09^ 'transport.defaultAmdNamespace' settingValue",
 messageSends: ["settingValue"],
 referencedClasses: []
 }),
@@ -2751,10 +2751,10 @@ protocol: 'accessing amd',
 fn: function (aString){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
-"vm.defaultAmdNamespace"._settingValue_(aString);
+"transport.defaultAmdNamespace"._settingValue_(aString);
 return self}, function($ctx1) {$ctx1.fill(self,"defaultAmdNamespace:",{aString:aString},globals.SmalltalkImage)})},
 args: ["aString"],
-source: "defaultAmdNamespace: aString\x0a\x09'vm.defaultAmdNamespace' settingValue: aString",
+source: "defaultAmdNamespace: aString\x0a\x09'transport.defaultAmdNamespace' settingValue: aString",
 messageSends: ["settingValue:"],
 referencedClasses: []
 }),

+ 2 - 2
st/Kernel-Infrastructure.st

@@ -1072,11 +1072,11 @@ amdRequire
 !
 
 defaultAmdNamespace
-	^ 'vm.defaultAmdNamespace' settingValue
+	^ 'transport.defaultAmdNamespace' settingValue
 !
 
 defaultAmdNamespace: aString
-	'vm.defaultAmdNamespace' settingValue: aString
+	'transport.defaultAmdNamespace' settingValue: aString
 ! !
 
 !SmalltalkImage methodsFor: 'classes'!

+ 3 - 3
support/helpers.js

@@ -25,7 +25,7 @@ define("amber/helpers", ["amber_vm/smalltalk", "amber_vm/globals", "require"], f
                 settings[key] = source[key];
             });
         }
-        settings['vm.defaultAmdNamespace'] = vm.defaultAmdNamespace;
+        settings['transport.defaultAmdNamespace'] = vm.defaultAmdNamespace;
         if (storage) {
             var fromStorage;
             try {
@@ -43,8 +43,8 @@ define("amber/helpers", ["amber_vm/smalltalk", "amber_vm/globals", "require"], f
             }
         }
         if (exports.defaultAmdNamespace) {
-            console.warn("`smalltalk.defaultAmdNamespace = 'namespace';` is deprecated. Please use `smalltalk.initialize({'vm.defaultAmdNamespace': 'namespace'});` instead.");
-            settings['vm.defaultAmdNamespace'] = settings['vm.defaultAmdNamespace'] || exports.defaultAmdNamespace;
+            console.warn("`smalltalk.defaultAmdNamespace = 'namespace';` is deprecated. Please use `smalltalk.initialize({'transport.defaultAmdNamespace': 'namespace'});` instead.");
+            settings['transport.defaultAmdNamespace'] = settings['transport.defaultAmdNamespace'] || exports.defaultAmdNamespace;
         }
         mixinToSettings(options);
         console.warn("smalltalk.ClassName is deprecated. Please use smalltalk.globals.ClassName instead.");