Remove the pane.retainFocusAfterFlip preference

Author: petetnt

src/nls/root/strings.js

@@ -776,7 +776,6 @@ define({
     "DESCRIPTION_OPEN_USER_PREFS_IN_SECOND_PANE"     : "false to open user preferences file in left/top pane",
     "DESCRIPTION_MERGE_PANES_WHEN_LAST_FILE_CLOSED"  : "true to collapse panes after the last file from the pane is closed via pane header close button",
     "DESCRIPTION_SHOW_PANE_HEADER_BUTTONS"           : "Toggle when to show the close and flip-view buttons on the header.",
-    "DESCRIPTION_RETAIN_FOCUS_AFTER_FLIP"            : "true to retain focus on the currently active pane, false to move focus to the new pane",
     "DEFAULT_PREFERENCES_JSON_HEADER_COMMENT"        : "/*\n * This is a read-only file with the preferences supported\n * by {APP_NAME}.\n * Use this file as a reference to modify your preferences\n * file \"brackets.json\" opened in the other pane.\n * For more information on how to use preferences inside\n * {APP_NAME}, refer to the web page at https://github.com/adobe/brackets/wiki/How-to-Use-Brackets#preferences\n */",
     "DEFAULT_PREFERENCES_JSON_DEFAULT"               : "Default",
     "DESCRIPTION_PURE_CODING_SURFACE"                : "true to enable code only mode and hide all other UI elements in {APP_NAME}"

src/view/Pane.js

@@ -192,12 +192,6 @@ define(function (require, exports, module) {
         values: ["hover", "always", "never"]
     });
 
-    // Define retainFocusAfterFlip, which controls which pane gets focus after a pane
-    // has been flipped.
-    PreferencesManager.definePreference("pane.retainFocusAfterFlip", "boolean", false, {
-        description: Strings.DESCRIPTION_RETAIN_FOCUS_AFTER_FLIP
-    });
-
     // Define mergePanesWhenLastFileClosed, which controls if a split view pane should be
     // closed when the last file is closed, skipping the "Open a file while this pane has focus"
     // step completely.
@@ -235,7 +229,6 @@ define(function (require, exports, module) {
         // Setup the container and the element we're inserting
         var self = this,
             showPaneHeaderButtonsPref = PreferencesManager.get("pane.showPaneHeaderButtons"),
-            retainFocusAfterFlip = PreferencesManager.get("pane.retainFocusAfterFlip"),
             $el = $container.append(Mustache.render(paneTemplate, {id: id})).find("#" + id),
             $header  = $el.find(".pane-header"),
             $headerText = $header.find(".pane-header-text"),
@@ -253,11 +246,6 @@ define(function (require, exports, module) {
             var otherPaneId = self.id === FIRST_PANE ? SECOND_PANE : FIRST_PANE;
             var otherPane = MainViewManager._getPane(otherPaneId);
 
-            // currently active pane is not necessarily self.id as just clicking the button does not
-            // give focus to the pane. This way it is possible to flip multiple panes to the active one
-            // without losing focus.
-            var activePaneIdBeforeFlip = MainViewManager.getActivePaneId();
-
             MainViewManager._moveView(self.id, otherPaneId, currentFile).always(function () {
                 CommandManager.execute(Commands.FILE_OPEN, {fullPath: currentFile.fullPath,
                                                             paneId: otherPaneId}).always(function () {
@@ -266,17 +254,8 @@ define(function (require, exports, module) {
 
                     // Defer the focusing until other focus events have occurred.
                     setTimeout(function () {
-                        if (retainFocusAfterFlip) {
-                            // Focus has most likely changed: give it back to the original pane.
-                            var activePaneBeforeFlip = MainViewManager._getPane(activePaneIdBeforeFlip);
-                            activePaneBeforeFlip.focus();
-                            self._lastFocusedElement = activePaneBeforeFlip.$el[0];
-                            MainViewManager.setActivePaneId(activePaneIdBeforeFlip);
-                        } else {
-                            // Other pane already has focus: update the Active Pane Id too.
-                            MainViewManager.setActivePaneId(otherPaneId);
-                            self._lastFocusedElement = otherPane.$el[0];
-                        }
+                        MainViewManager.setActivePaneId(otherPaneId);
+                        self._lastFocusedElement = otherPane.$el[0];
                     }, 1);
                 });
             });