Browse Source

smalltalk.initialize official facade API in 'amber/helpers'

Herbert Vojčík 10 years ago
parent
commit
bea698706b
4 changed files with 13 additions and 13 deletions
  1. 1 2
      cli/index.html
  2. 1 2
      helios.html
  3. 1 2
      index.html
  4. 10 7
      support/helpers.js

+ 1 - 2
cli/index.html

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

+ 1 - 2
helios.html

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

+ 1 - 2
index.html

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

+ 10 - 7
support/helpers.js

@@ -14,6 +14,16 @@ define("amber/helpers", ["amber_vm/smalltalk", "amber_vm/globals", "require"], f
         value: globals,
         enumerable: true, configurable: true, writable: false
     });
+    exports.initialize = function (options) {
+        options = options || {};
+        if (exports.defaultAmdNamespace) {
+            console.warn("`smalltalk.defaultAmdNamespace = 'foo';` is deprecated. Please use `smalltalk.initialize({defaultAmdNamespace: 'foo'});` instead.");
+            options.defaultAmdNamespace = options.defaultAmdNamespace || exports.defaultAmdNamespace;
+        }
+        vm.defaultAmdNamespace = options.defaultAmdNamespace || vm.defaultAmdNamespace;
+        console.warn("smalltalk.ClassName is deprecated. Please  use smalltalk.globals.ClassName instead.");
+        return vm.initialize();
+    };
 
     // Backward compatibility, deprecated
 
@@ -22,13 +32,6 @@ define("amber/helpers", ["amber_vm/smalltalk", "amber_vm/globals", "require"], f
         enumerable: true, configurable: true, writable: false
     });
     exports.defaultAmdNamespace = null;
-    exports.initialize = function () {
-        console.warn("smalltalk.defaultAmdNamespace is deprecated. Please use smalltalk.vm.defaultAmdNamespace instead.");
-        console.warn("smalltalk.initialize is deprecated. Please  use smalltalk.vm.initialize instead.");
-        console.warn("smalltalk.ClassName is deprecated. Please  use smalltalk.globals.ClassName instead.");
-        vm.defaultAmdNamespace = exports.defaultAmdNamespace || vm.defaultAmdNamespace;
-        return vm.initialize();
-    };
 
     // Exports