Loading a project is now only complete after the active document (if …

…present) has been loaded
adobe · Jan 7, 2013 · 15fa7bb · 15fa7bb
1 parent 8a2858b
commit 15fa7bb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js
@@ -1094,7 +1094,7 @@ define(function (require, exports, module) {
      * @private
      * Initializes the working set.
      */
-    function _projectOpen() {
+    function _projectOpen(e) {
         _isProjectChanging = false;
 
         // file root is appended for each project
@@ -1124,7 +1124,9 @@ define(function (require, exports, module) {
         }
 
         if (activeFile) {
-            CommandManager.execute(Commands.FILE_OPEN, { fullPath: activeFile });
+            var promise = CommandManager.execute(Commands.FILE_OPEN, { fullPath: activeFile });
+            // Add this promise to the event's promises to signal that this handler isn't done yet
+            e.promises.push(promise);
         }
     }
 

diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js
@@ -782,10 +782,13 @@ define(function (require, exports, module) {
 
                     resultRenderTree.done(function () {
                         if (projectRootChanged) {
-                            $(exports).triggerHandler("projectOpen", _projectRoot);
+                            // Allow asynchronous event handlers to finish before resolving result by collecting promises from them
+                            var promises = [];
+                            $(exports).triggerHandler({ type: "projectOpen", promises: promises }, [_projectRoot, promises]);
+                            $.when.apply($, promises).pipe(result.resolve, result.reject);
+                        } else {
+                            result.resolve();
                         }
-
-                        result.resolve();
                     });
                     resultRenderTree.fail(function () {
                         PerfUtils.terminateMeasurement(perfTimerName);