Address review comments.

See adobe#11184.
sprintr · Jul 13, 2015 · b27c8ff · b27c8ff
1 parent 06c9aa6
commit b27c8ff
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/extensibility/ExtensionManager.js b/src/extensibility/ExtensionManager.js
@@ -566,6 +566,13 @@ define(function (require, exports, module) {
     function hasExtensionsToDisable() {
         return Object.keys(_idsToDisable).length > 0;
     }
+
+    /**
+     * Unmarks all the extensions that have been marked for disabling.
+     */
+    function unmarkAllForDisabling() {
+        _idsToDisable = {};
+    }
 
     /**
      * If a downloaded package appears to be an update, mark the extension for update.
@@ -902,6 +909,7 @@ define(function (require, exports, module) {
     exports.hasExtensionsToRemove   = hasExtensionsToRemove;
     exports.markForDisabling        = markForDisabling;
     exports.isMarkedForDisabling    = isMarkedForDisabling;
+    exports.unmarkAllForDisabling   = unmarkAllForDisabling;
     exports.hasExtensionsToDisable  = hasExtensionsToDisable;
     exports.updateFromDownload      = updateFromDownload;
     exports.removeUpdate            = removeUpdate;

diff --git a/src/extensibility/ExtensionManagerDialog.js b/src/extensibility/ExtensionManagerDialog.js
@@ -117,18 +117,15 @@ define(function (require, exports, module) {
                     updateErrors,
                     disableErrors;
 
-                removeExtensionsPromise = ExtensionManager.removeMarkedExtensions();
-                removeExtensionsPromise
+                removeExtensionsPromise = ExtensionManager.removeMarkedExtensions()
                     .fail(function (errorArray) {
                         removeErrors = errorArray;
                     });
-                updateExtensionsPromise = ExtensionManager.updateExtensions();
-                updateExtensionsPromise
+                updateExtensionsPromise = ExtensionManager.updateExtensions()
                     .fail(function (errorArray) {
                         updateErrors = errorArray;
                     });
-                disableExtensionsPromise = ExtensionManager.disableMarkedExtensions();
-                disableExtensionsPromise
+                disableExtensionsPromise = ExtensionManager.disableMarkedExtensions()
                     .fail(function (errorArray) {
                         disableErrors = errorArray;
                     });
@@ -207,6 +204,7 @@ define(function (require, exports, module) {
                 dlg.close();
                 ExtensionManager.cleanupUpdates();
                 ExtensionManager.unmarkAllForRemoval();
+                ExtensionManager.unmarkAllForDisabling();
             }
         });
     }

diff --git a/src/extensibility/Package.js b/src/extensibility/Package.js
@@ -471,6 +471,7 @@ define(function (require, exports, module) {
                 .done(result.resolve)
                 .fail(result.reject);
         });
+        return result.promise();
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -471,6 +471,7 @@ define(function (require, exports, module) { @@
                     .done(result.resolve)
                     .fail(result.reject);
             });
+            return result.promise();
         }
         /**
@@ Expand Down @@