Merge pull request #9373 from adobe/jeff/wsv-drag-final

Working Set Draggable

Author: redmunds

src/document/DocumentCommandHandlers.js

@@ -244,12 +244,13 @@ define(function (require, exports, module) {
      * @param {!string} fullPath
      * @param {boolean=} silent If true, don't show error message
      * @param {string=} paneId, the id oi the pane in which to open the file. Can be undefined, a valid pane id or ACTIVE_PANE. 
+     * @param {{*}=} options, command options
      * @return {$.Promise} a jQuery promise that will either
      * - be resolved with a file for the specified file path or
      * - be rejected with FileSystemError if the file can not be read.
      * If paneId is undefined, the ACTIVE_PANE constant
      */
-    function _doOpen(fullPath, silent, paneId) {
+    function _doOpen(fullPath, silent, paneId, options) {
         var result = new $.Deferred();
 
         // workaround for https://github.com/adobe/brackets/issues/6001
@@ -288,7 +289,7 @@ define(function (require, exports, module) {
             });
 
             var file = FileSystem.getFileForPath(fullPath);
-            MainViewManager._open(paneId, file)
+            MainViewManager._open(paneId, file, options)
                 .done(function () {
                     result.resolve(file);
                 })
@@ -314,10 +315,11 @@ define(function (require, exports, module) {
      * @param {?string} fullPath - The path of the file to open; if it's null we'll prompt for it
      * @param {boolean=} silent - If true, don't show error message
      * @param {string=}  paneId - the pane in which to open the file. Can be undefined, a valid pane id or ACTIVE_PANE
+     * @param {{*}=} options - options to pass to MainViewManager._open
      * @return {$.Promise} a jQuery promise resolved with a Document object or 
      *                      rejected with an err 
      */
-    function _doOpenWithOptionalPath(fullPath, silent, paneId) {
+    function _doOpenWithOptionalPath(fullPath, silent, paneId, options) {
         var result;
         paneId = paneId || MainViewManager.ACTIVE_PANE;
         if (!fullPath) {
@@ -341,7 +343,7 @@ define(function (require, exports, module) {
                         });
                         MainViewManager.addListToWorkingSet(paneId, filesToOpen);
 
-                        _doOpen(paths[paths.length - 1], silent, paneId)
+                        _doOpen(paths[paths.length - 1], silent, paneId, options)
                             .done(function (file) {
                                 _defaultOpenDialogFullPath =
                                     FileUtils.getDirectoryPath(
@@ -357,7 +359,7 @@ define(function (require, exports, module) {
                 }
             });
         } else {
-            result = _doOpen(fullPath, silent, paneId);
+            result = _doOpen(fullPath, silent, paneId, options);
         }
 
         return result.promise();
@@ -414,9 +416,11 @@ define(function (require, exports, module) {
             paneId = (commandData && commandData.paneId) || MainViewManager.ACTIVE_PANE,
             result = new $.Deferred();
 
-        _doOpenWithOptionalPath(fileInfo.path, silent, paneId)
+        _doOpenWithOptionalPath(fileInfo.path, silent, paneId, commandData && commandData.options)
             .done(function (file) {
-                MainViewManager.setActivePaneId(paneId);
+                if (!commandData || !commandData.options || !commandData.options.noPaneActivate) {
+                    MainViewManager.setActivePaneId(paneId);
+                }
 
                 // If a line and column number were given, position the editor accordingly.
                 if (fileInfo.line !== null) {

src/editor/EditorManager.js

@@ -554,8 +554,10 @@ define(function (require, exports, module) {
         // show the view
         pane.showView(document._masterEditor);
 
-        // give it focus
-        document._masterEditor.focus();
+        if (MainViewManager.getActivePaneId() === pane.id) {
+            // give it focus
+            document._masterEditor.focus();
+        }
 
         if (createdNewEditor) {
             _restoreEditorViewState(document._masterEditor);

src/htmlContent/working-set.html

@@ -1,4 +1,4 @@
-<div id="{{id}}">
+<div class="working-set-view" id="{{id}}">
     <div class="working-set-header"><span class="working-set-header-title">{{WORKING_FILES}}</span></div>
     <div class="open-files-container">
         <!-- This will contain runtime-generated <li>'s for each file in the working set -->