Browse Source

Move image boot call to st.initialize.

Herbert Vojčík 7 years ago
parent
commit
9eb3058a57
2 changed files with 3 additions and 10 deletions
  1. 3 1
      support/boot.js
  2. 0 9
      support/kernel-runtime.js

+ 3 - 1
support/boot.js

@@ -46,9 +46,10 @@ define([
 
     require(['./kernel-runtime']); // preload
 
-    SmalltalkInitBrik.deps = ["classes"];
+    SmalltalkInitBrik.deps = ["classes", "smalltalkGlobals"];
     function SmalltalkInitBrik (brikz, st) {
         var bootstrapHierarchy = brikz.classes.bootstrapHierarchy;
+        var globals = brikz.smalltalkGlobals.globals;
 
         var initialized = false;
         var runtimeLoadedPromise = new Promise(function (resolve, reject) {
@@ -62,6 +63,7 @@ define([
                 if (initialized) return;
                 bootstrapHierarchy();
                 configureWithRuntime(brikz);
+                globals.AmberBootstrapInitialization._run();
                 initialized = true;
             });
         };

+ 0 - 9
support/kernel-runtime.js

@@ -465,14 +465,6 @@ define(function () {
         this.messageNotUnderstood = messageNotUnderstood;
     }
 
-    StartImageBrik.deps = ["frameBinding", "runtimeMethods", "runtime", "primitives"];
-    function StartImageBrik (brikz, st) {
-        this.__init__ = function () {
-            brikz.smalltalkGlobals.globals.AmberBootstrapInitialization._run();
-        };
-        this.__init__.once = true;
-    }
-
     /* Making smalltalk that can run */
 
     function configureWithRuntime (brikz) {
@@ -484,7 +476,6 @@ define(function () {
         brikz.messageSend = MessageSendBrik;
         brikz.runtime = RuntimeBrik;
         brikz.primitives = PrimitivesBrik;
-        brikz.startImage = StartImageBrik;
 
         brikz.rebuild();
     }