Merge 112677 - Web Inspector: ScriptsNavigator scripts selection/focus polish.

Source/WebCore/inspector/front-end/ScriptsPanel.js

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 655 matching lines @@
 
         // We don't need to update file selector here regardless of whether useScriptsNavigator is set or not:
         // SingleFileEditorContainer never dispatches EditorClosed, so no need to update ComboBoxFileSelector;
         // ScriptsNavigator does not need to update on EditorClosed.
 
         this._updateScriptViewStatusBarItems();
     },
 
     _editorSelected: function(event)
     {
-        this._hideNavigatorOverlay();
         var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data;
         this._showFile(uiSourceCode);
+        this._hideNavigatorOverlay();
     },
 
     _fileSelected: function(event)
     {
-        this._hideNavigatorOverlay();
         var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data;
         this._showFile(uiSourceCode);
+        this._hideNavigatorOverlay();
     },
 
     _fileSelectorReleasedFocus: function(event)
     {
         var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data;
         var sourceFrame = this._sourceFramesByUISourceCode.get(uiSourceCode);
         if (sourceFrame)
             sourceFrame.focus();
     },
 
@@ skipping 346 matching lines @@
 
         this._sidebarOverlay.show(this.editorView.element);
     },
 
     _hideNavigatorOverlay: function()
     {
         if (!this._navigatorOverlayShown)
             return;
 
         this._sidebarOverlay.hide();
+        if (this.visibleView)
+            this.visibleView.focus();
     },
 
     _navigatorOverlayWasShown: function(event)
     {
         this._navigatorView.element.appendChild(this._navigatorShowHideButton);
         this._navigatorShowHideButton.addStyleClass("toggled-on");
         this._navigatorShowHideButton.title = WebInspector.UIString("Hide scripts navigator");
         this._navigator.focus();
         this.registerShortcut(WebInspector.KeyboardShortcut.Keys.Esc.code, this._escDownWhileNavigatorOverlayOpen.bind(this));
     },
@@ skipping 683 matching lines @@
         if (this._currentSourceFrame)
             this._currentSourceFrame.detach();
         this._currentSourceFrame = null;
         this._currentFile = null;
         delete this._initialViewSelectionProcessed;
         delete this._userSelectedFiles;
     }
 }
 
 WebInspector.ScriptsPanel.SingleFileEditorContainer.prototype.__proto__ = WebInspector.Object.prototype;