Merge pull request adobe#358 from humphd/double-firing-ready

Don't double-fire bramble:loaded, and Bramble ready event
gideonthomas · Jun 22, 2015 · 2638fef · 2638fef
2 parents 364aac5 + ac57a6c
commit 2638fef
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/extensions/default/bramble/main.js b/src/extensions/default/bramble/main.js
@@ -175,10 +175,14 @@ define(function (require, exports, module) {
         startLiveDev();
 
         // Preload BlobURLs for all assets in the filesystem
-        BlobUtils.preload(BrambleStartupProject.getInfo().root, finishStartup);
+        BlobUtils.preload(BrambleStartupProject.getInfo().root, function(err) {
+            if(err) {
+                // Possibly non-critical error, warn at least, but keep going.
+                console.warn("[Bramble] unable to preload all filesystem Blob URLs", err);
+            }
 
-        // When the app is loaded and ready, hide the menus/toolbars
-        UI.initUI(finishStartup);
+            UI.initUI(finishStartup);
+        });
     });
 
     // We expect the hosting app to setup the filesystem, and give us a