adobe
diff --git a/‎src/extensibility/ExtensionManager.js
Copy file name to clipboard
+10-6Lines changed: 10 additions & 6 deletions b/‎src/extensibility/ExtensionManager.js
Copy file name to clipboard
+10-6Lines changed: 10 additions & 6 deletions
diff --git a/‎src/extensibility/ExtensionManagerDialog.js
Copy file name to clipboard
+182-4Lines changed: 182 additions & 4 deletions b/‎src/extensibility/ExtensionManagerDialog.js
Copy file name to clipboard
+182-4Lines changed: 182 additions & 4 deletions
diff --git a/‎src/extensibility/InstallExtensionDialog.js
Copy file name to clipboard
+31-7Lines changed: 31 additions & 7 deletions b/‎src/extensibility/InstallExtensionDialog.js
Copy file name to clipboard
+31-7Lines changed: 31 additions & 7 deletions
@@ -373,11 +373,12 @@ define(function (require, exports, module) {
      * Updates an installed extension with the given package file.
      * @param {string} id of the extension
      * @param {string} packagePath path to the package file
+     * @param {boolean=} keepFile Flag to keep extension package file, default=false
      * @return {$.Promise} A promise that's resolved when the extension is updated or
      *     rejected with an error if there's a problem with the update.
      */
-    function update(id, packagePath) {
-        return Package.installUpdate(packagePath, id);
+    function update(id, packagePath, keepFile) {
+        return Package.installUpdate(packagePath, id, keepFile);
     }
 
     /**
@@ -386,8 +387,11 @@ define(function (require, exports, module) {
      */
     function cleanupUpdates() {
         Object.keys(_idsToUpdate).forEach(function (id) {
-            var filename = _idsToUpdate[id].localPath;
-            if (filename) {
+            var installResult = _idsToUpdate[id],
+                keepFile = installResult.keepFile,
+                filename = _idsToUpdate.localPath;
+
+            if (filename && !keepFile) {
                 FileSystem.getFileForPath(filename).unlink();
             }
         });
@@ -461,7 +465,7 @@ define(function (require, exports, module) {
         if (!installationResult) {
             return;
         }
-        if (installationResult.localPath) {
+        if (installationResult.localPath && !installationResult.keepFile) {
             FileSystem.getFileForPath(installationResult.localPath).unlink();
         }
         delete _idsToUpdate[id];
@@ -513,7 +517,7 @@ define(function (require, exports, module) {
             Object.keys(_idsToUpdate),
             function (id) {
                 var installationResult = _idsToUpdate[id];
-                return update(installationResult.name, installationResult.localPath);
+                return update(installationResult.name, installationResult.localPath, installationResult.keepFile);
             }
         );
     }
 
@@ -27,8 +27,11 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var Dialogs                     = require("widgets/Dialogs"),
+    var _                           = require("thirdparty/lodash"),
+        Dialogs                     = require("widgets/Dialogs"),
         DefaultDialogs              = require("widgets/DefaultDialogs"),
+        FileSystem                  = require("filesystem/FileSystem"),
+        FileUtils                   = require("file/FileUtils"),
         Package                     = require("extensibility/Package"),
         Strings                     = require("strings"),
         StringUtils                 = require("utils/StringUtils"),
@@ -48,6 +51,11 @@ define(function (require, exports, module) {
 
     var _activeTabIndex;
 
+    function _stopEvent(event) {
+        event.stopPropagation();
+        event.preventDefault();
+    }
+
     /**
      * @private
      * Triggers changes requested by the dialog UI.
@@ -156,6 +164,98 @@ define(function (require, exports, module) {
         });
     }
 
+    
+    /**
+     * @private
+     * Install extensions from the local file system using the install dialog.
+     * @return {$.Promise}
+     */
+    function _installUsingDragAndDrop() {
+        var installZips = [],
+            updateZips = [],
+            deferred = new $.Deferred(),
+            validatePromise;
+
+        brackets.app.getDroppedFiles(function (err, paths) {
+            if (err) {
+                // Only possible error is invalid params, silently ignore
+                console.error(err);
+                deferred.resolve();
+                return;
+            }
+
+            // Parse zip files and separate new installs vs. updates
+            validatePromise = Async.doInParallel_aggregateErrors(paths, function (path) {
+                var result = new $.Deferred();
+                
+                FileSystem.resolve(path, function (err, file) {
+                    var extension = FileUtils.getFileExtension(path),
+                        isZip = file.isFile && (extension === "zip"),
+                        errStr;
+                    
+                    if (err) {
+                        errStr = FileUtils.getFileErrorString(err);
+                    } else if (!isZip) {
+                        errStr = Strings.INVALID_ZIP_FILE;
+                    }
+
+                    if (errStr) {
+                        result.reject(errStr);
+                        return;
+                    }
+                    
+                    // Call validate() so that we open the local zip file and parse the
+                    // package.json. We need the name to detect if this zip will be a
+                    // new install or an update.
+                    Package.validate(path, { requirePackageJSON: true }).done(function (info) {
+                        if (info.errors.length) {
+                            result.reject(Package.formatError(info.errors));
+                            return;
+                        }
+
+                        var extensionName = info.metadata.name,
+                            extensionInfo = ExtensionManager.extensions[extensionName],
+                            isUpdate = extensionInfo && !!extensionInfo.installInfo;
+
+                        if (isUpdate) {
+                            updateZips.push(file);
+                        } else {
+                            installZips.push(file);
+                        }
+
+                        result.resolve();
+                    }).fail(function (err) {
+                        result.reject(Package.formatError(err));
+                    });
+                });
+                
+                return result.promise();
+            });
+
+            validatePromise.done(function () {
+                var installPromise = Async.doSequentially(installZips, function (file) {
+                    return InstallExtensionDialog.installUsingDialog(file);
+                });
+
+                var updatePromise = installPromise.then(function () {
+                    return Async.doSequentially(updateZips, function (file) {
+                        return InstallExtensionDialog.updateUsingDialog(file).done(function (result) {
+                            ExtensionManager.updateFromDownload(result);
+                        });
+                    });
+                });
+                
+                // InstallExtensionDialog displays it's own errors, always
+                // resolve the outer promise
+                updatePromise.always(deferred.resolve);
+            }).fail(function (errorArray) {
+                deferred.reject(errorArray);
+            });
+        });
+        
+        return deferred.promise();
+    }
+    
     /**
      * @private
      * Show a dialog that allows the user to browse and manage extensions.
@@ -296,9 +396,7 @@ define(function (require, exports, module) {
             // Open dialog to Installed tab if extension updates are available
             if ($("#toolbar-extension-manager").hasClass('updatesAvailable')) {
                 $dlg.find(".nav-tabs a.installed").tab("show");
-            }
-            // Otherwise show the first tab
-            else {
+            } else { // Otherwise show the first tab
                 $dlg.find(".nav-tabs a:first").tab("show");
             }
         });
@@ -309,6 +407,86 @@ define(function (require, exports, module) {
                 InstallExtensionDialog.showDialog().done(ExtensionManager.updateFromDownload);
             });
 
+        // Handle the drag/drop zone
+        var $dropzone = $("#install-drop-zone"),
+            $dropmask = $("#install-drop-zone-mask");
+        
+        $dropzone
+            .on("dragover", function (event) {
+                _stopEvent(event);
+
+                if (!event.originalEvent.dataTransfer.files) {
+                    return;
+                }
+
+                var items = event.originalEvent.dataTransfer.items,
+                    isValidDrop = false;
+
+                isValidDrop = _.every(items, function (item) {
+                    if (item.kind === "file") {
+                        var entry = item.webkitGetAsEntry(),
+                            extension = FileUtils.getFileExtension(entry.fullPath);
+
+                        return entry.isFile && extension === "zip";
+                    }
+
+                    return false;
+                });
+
+                if (isValidDrop) {
+                    // Set an absolute width to stabilize the button size
+                    $dropzone.width($dropzone.width());
+
+                    // Show drop styling and message
+                    $dropzone.removeClass("drag");
+                    $dropzone.addClass("drop");
+                } else {
+                    event.originalEvent.dataTransfer.dropEffect = "none";
+                }
+            })
+            .on("drop", _stopEvent);
+        
+        $dropmask
+            .on("dragover", function (event) {
+                _stopEvent(event);
+                event.originalEvent.dataTransfer.dropEffect = "copy";
+            })
+            .on("dragleave", function () {
+                $dropzone.removeClass("drop");
+                $dropzone.addClass("drag");
+            })
+            .on("drop", function (event) {
+                _stopEvent(event);
+                
+                if (event.originalEvent.dataTransfer.files) {
+                    // Attempt install
+                    _installUsingDragAndDrop().fail(function (errorArray) {
+                        var message = Strings.INSTALL_EXTENSION_DROP_ERROR;
+
+                        message += "<ul class='dialog-list'>";
+                        errorArray.forEach(function (info) {
+                            message += "<li><span class='dialog-filename'>";
+                            message += StringUtils.breakableUrl(info.item);
+                            message += "</span>: " + info.error + "</li>";
+                        });
+                        message += "</ul>";
+
+                        Dialogs.showModalDialog(
+                            DefaultDialogs.DIALOG_ID_ERROR,
+                            Strings.EXTENSION_MANAGER_TITLE,
+                            message
+                        );
+                    }).always(function () {
+                        $dropzone.removeClass("validating");
+                        $dropzone.addClass("drag");
+                    });
+                    
+                    // While installing, show validating message
+                    $dropzone.removeClass("drop");
+                    $dropzone.addClass("validating");
+                }
+            });
+        
         return new $.Deferred().resolve(dialog).promise();
     }
 
 
@@ -29,6 +29,7 @@ define(function (require, exports, module) {
     "use strict";
 
     var Dialogs                = require("widgets/Dialogs"),
+        File                   = require("filesystem/File"),
         StringUtils            = require("utils/StringUtils"),
         Strings                = require("strings"),
         Commands               = require("command/Commands"),
@@ -285,7 +286,7 @@ define(function (require, exports, module) {
         } else if (this._state === STATE_ALREADY_INSTALLED) {
             // If we were prompting the user about overwriting a previous installation,
             // and the user cancels, we can delete the downloaded file.
-            if (this._installResult && this._installResult.localPath) {
+            if (this._installResult && this._installResult.localPath && !this._installResult.keepFile) {
                 var filename = this._installResult.localPath;
                 FileSystem.getFileForPath(filename).unlink();
             }
@@ -404,13 +405,34 @@ define(function (require, exports, module) {
 
 
     /** Mediates between this module and the Package extension-installation utils. Mockable for unit-testing. */
-    function InstallerFacade() { }
+    function InstallerFacade(isLocalFile) {
+        this._isLocalFile = isLocalFile;
+    }
+
     InstallerFacade.prototype.install = function (url) {
         if (this.pendingInstall) {
             console.error("Extension installation already pending");
             return new $.Deferred().reject("DOWNLOAD_ID_IN_USE").promise();
         }
-        this.pendingInstall = Package.installFromURL(url);
+
+        if (this._isLocalFile) {
+            var deferred = new $.Deferred();
+
+            this.pendingInstall = {
+                promise: deferred.promise(),
+                cancel: function () {
+                    // Can't cancel local zip installs
+                }
+            };
+
+            Package.installFromPath(url).then(function (installationResult) {
+                // Flag to keep zip files for local file installation
+                installationResult.keepFile = true;
+                deferred.resolve(installationResult);
+            }, deferred.reject);
+        } else {
+            this.pendingInstall = Package.installFromURL(url);
+        }
 
         // Store now since we'll null pendingInstall immediately if the promise was resolved synchronously
         var promise = this.pendingInstall.promise;
@@ -440,14 +462,16 @@ define(function (require, exports, module) {
     /**
      * @private
      * Show the installation dialog and automatically begin installing the given URL.
-     * @param {string=} urlToInstall If specified, immediately starts installing the given file as if the user had
+     * @param {(string|File)=} urlOrFileToInstall If specified, immediately starts installing the given file as if the user had
      *     specified it.
      * @return {$.Promise} A promise object that will be resolved when the selected extension
      *     has finished installing, or rejected if the dialog is cancelled.
      */
-    function installUsingDialog(urlToInstall, _isUpdate) {
-        var dlg = new InstallExtensionDialog(new InstallerFacade(), _isUpdate);
-        return dlg.show(urlToInstall);
+    function installUsingDialog(urlOrFileToInstall, _isUpdate) {
+        var isLocalFile = (urlOrFileToInstall instanceof File),
+            dlg = new InstallExtensionDialog(new InstallerFacade(isLocalFile), _isUpdate);
+
+        return dlg.show(urlOrFileToInstall.fullPath || urlOrFileToInstall);
     }
 
     /**