DevTools: rework focus logic

third_party/WebKit/Source/devtools/front_end/ui/Dialog.js

 /*
  * Copyright (C) 2012 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 55 matching lines @@
     {
         if (WebInspector.Dialog._instance)
             WebInspector.Dialog._instance.detach();
         WebInspector.Dialog._instance = this;
 
         var document = /** @type {!Document} */ (WebInspector.Dialog._modalHostView.element.ownerDocument);
         this._disableTabIndexOnElements(document);
 
         this._glassPane = new WebInspector.GlassPane(document, this._dimmed);
         this._glassPane.element.addEventListener("click", this._onGlassPaneClick.bind(this), false);
-        WebInspector.GlassPane.DefaultFocusedViewStack.push(this);
+
+        // When a dialog closes, focus should be restored to the previous focused element when
+        // possible, otherwise the default inspector view element.
+        WebInspector.Dialog._previousFocusedElement = WebInspector.currentFocusElement() || WebInspector.inspectorView.defaultFocusedElement();

[dgozman, 2016/05/27 01:05:59]

Use WebInspector.Dialog._modalHostView instead of inspectorView.

[luoe, 2016/05/27 23:20:40]

Done.

 
         WebInspector.Widget.prototype.show.call(this, this._glassPane.element);
 
         this._position();
         this.focus();
     },
 
     /**
      * @override
      */
     detach: function()
     {
         WebInspector.Widget.prototype.detach.call(this);
 
-        WebInspector.GlassPane.DefaultFocusedViewStack.pop();
         this._glassPane.dispose();
         delete this._glassPane;
 
+        if (WebInspector.Dialog._previousFocusedElement)
+            WebInspector.Dialog._previousFocusedElement.focus();

[dgozman, 2016/05/27 01:05:59]

delete WebInspector.Dialog._previousFocusedElement

[luoe, 2016/05/27 23:20:40]

Done.

         this._restoreTabIndexOnElements();
 
         delete WebInspector.Dialog._instance;
     },
 
     addCloseButton: function()
     {
         var closeButton = this.contentElement.createChild("div", "dialog-close-button", "dt-close-button");
         closeButton.gray = true;
         closeButton.addEventListener("click", this.detach.bind(this, false), false);
@@ skipping 139 matching lines @@
     {
         var children = this.children();
         if (children.length)
             return children[0].defaultFocusedElement();
         return this.element;
     },
 
     __proto__: WebInspector.Widget.prototype
 };
 
+/** @type {?Element} */
+WebInspector.Dialog._previousFocusedElement = null;
+
 /** @type {?WebInspector.Widget} */
 WebInspector.Dialog._modalHostView = null;
 
 /**
  * @param {!WebInspector.Widget} view
  */
 WebInspector.Dialog.setModalHostView = function(view)
 {
     WebInspector.Dialog._modalHostView = view;
 };
 
 /**
  * FIXME: make utility method in Dialog, so clients use it instead of this getter.
  * Method should be like Dialog.showModalElement(position params, reposition callback).
  * @return {?WebInspector.Widget}
  */
 WebInspector.Dialog.modalHostView = function()
 {
     return WebInspector.Dialog._modalHostView;
 };
 
 WebInspector.Dialog.modalHostRepositioned = function()
 {
     if (WebInspector.Dialog._instance)
         WebInspector.Dialog._instance._position();
 };