@dualbox/editor 1.0.42 → 1.0.43

package/js/dist/GraphEditor.min.js

@@ -103979,11 +103979,13 @@ class DualboxEditor {
                                 throw "Failed to load script " + pkg.name;
                             });
 
+                            /*
                             var timeout = setTimeout(function () {
                                 cb("Failed to load " + pkg.name + " after 5 seconds");
                             }, 5000);
+                            */
                             script[0].addEventListener("load", () => {
-                                clearTimeout(timeout);
+                                //clearTimeout(timeout);
                                 cb();
                             });
                         }
@@ -104025,16 +104027,6 @@ class DualboxEditor {
             return require(name); // TODO: local only for now
         };
 
-        // Safety when the user leave the page,
-        // if not already defined externally
-        if (!window.onbeforeunload) {
-            window.onbeforeunload = function () {
-                return "Unsaved changes will be lost, are you sure you want to leave the editor?";
-            };
-        }
-
-        this.loadCorePackages();
-
         // if defined, call progress callback when needed
         // signature: onLoadProgress(stepName, percentage);
         this.onLoadProgress = attrs.onLoadProgress || function (stepName, numberDone, numberTotal) {
@@ -104045,13 +104037,17 @@ class DualboxEditor {
             }
         };
 
-        if (attrs.json) {
-            this.onLoadProgress((step, nbDone, nbTotal) => {
-                if (attrs.onLoadProgress) {
-                    p.onLoadProgress(step, nbDone, nbTotal);
-                }
-            });
+        // Safety when the user leave the page,
+        // if not already defined externally
+        if (!window.onbeforeunload) {
+            window.onbeforeunload = function () {
+                return "Unsaved changes will be lost, are you sure you want to leave the editor?";
+            };
+        }
+
+        this.loadCorePackages();
 
+        if (attrs.json) {
             this.onReady(() => {
                 var p = this.setApp(attrs.json);
                 if (attrs.onLoaded) {
@@ -104069,12 +104065,14 @@ class DualboxEditor {
     async loadCorePackages() {
 
         var pkgName = "@dualbox/dualbox";
+        this.onLoadProgress("Loading Dualbox");
         await this.loadPackage(pkgName);
         if (window.DualBox && window.DualBox.start) {
             this.DualBox = window.DualBox;
         } else {
             this.DualBox = window.DualBox = this.require(pkgName);
         }
+
         lodash.each(this.DualBox.core, async corePackage => {
             await this.loadPackage(corePackage.name);
         });

package/js/src/GraphEditor.js

@@ -150,11 +150,13 @@ class DualboxEditor {
                                 throw "Failed to load script " + pkg.name;
                             });
 
+                            /*
                             var timeout = setTimeout(function () {
                                 cb("Failed to load " + pkg.name + " after 5 seconds");
                             }, 5000);
+                            */
                             script[0].addEventListener("load", () => {
-                                clearTimeout(timeout);
+                                //clearTimeout(timeout);
                                 cb();
                             });
                         }
@@ -196,16 +198,6 @@ class DualboxEditor {
             return require(name); // TODO: local only for now
         };
 
-        // Safety when the user leave the page,
-        // if not already defined externally
-        if (!window.onbeforeunload) {
-            window.onbeforeunload = function () {
-                return "Unsaved changes will be lost, are you sure you want to leave the editor?";
-            };
-        }
-
-        this.loadCorePackages();
-
         // if defined, call progress callback when needed
         // signature: onLoadProgress(stepName, percentage);
         this.onLoadProgress = attrs.onLoadProgress || function (stepName, numberDone, numberTotal) {
@@ -216,13 +208,17 @@ class DualboxEditor {
             }
         };
 
-        if (attrs.json) {
-            this.onLoadProgress((step, nbDone, nbTotal) => {
-                if (attrs.onLoadProgress) {
-                    p.onLoadProgress(step, nbDone, nbTotal);
-                }
-            });
+        // Safety when the user leave the page,
+        // if not already defined externally
+        if (!window.onbeforeunload) {
+            window.onbeforeunload = function () {
+                return "Unsaved changes will be lost, are you sure you want to leave the editor?";
+            };
+        }
+
+        this.loadCorePackages();
 
+        if (attrs.json) {
             this.onReady(() => {
                 var p = this.setApp(attrs.json);
                 if (attrs.onLoaded) {
@@ -243,12 +239,14 @@ class DualboxEditor {
         };
 
         var pkgName = "@dualbox/dualbox";
+        this.onLoadProgress("Loading Dualbox");
         await this.loadPackage(pkgName);
         if (window.DualBox && window.DualBox.start) {
             this.DualBox = window.DualBox;
         } else {
             this.DualBox = window.DualBox = this.require(pkgName);
         }
+
         _.each(this.DualBox.core, async corePackage => {
             await this.loadPackage(corePackage.name);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dualbox/editor",
-  "version": "1.0.42",
+  "version": "1.0.43",
   "description": "Editor of Dualbox apps",
   "browser": "js/dist/GraphEditor.js",
   "main": "js/dist/GraphEditor.js",