Bug 769672 - GCLI shouldn't grab focus on startup; r=dcamp

Brli · Jul 5, 2012 · 10210f0 · 10210f0
1 parent b4e9265
commit 10210f0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
@@ -1400,7 +1400,7 @@ var gBrowserInit = {
 
       // Show the toolbar if it was previously visible
       if (gPrefService.getBoolPref("devtools.toolbar.visible")) {
-        DeveloperToolbar.show();
+        DeveloperToolbar.show(false);
       }
     }
 

diff --git a/browser/devtools/commandline/test/head.js b/browser/devtools/commandline/test/head.js
@@ -55,7 +55,7 @@ let DeveloperToolbarTest = {
       ok(false, "DeveloperToolbar.visible at start of openDeveloperToolbar");
     }
     else {
-      DeveloperToolbar.show(aCallback);
+      DeveloperToolbar.show(true, aCallback);
     }
   },
 

diff --git a/browser/devtools/shared/DeveloperToolbar.jsm b/browser/devtools/shared/DeveloperToolbar.jsm
@@ -106,7 +106,7 @@ DeveloperToolbar.prototype.toggle = function DT_toggle()
   if (this.visible) {
     this.hide();
   } else {
-    this.show();
+    this.show(true);
   }
 };
 
@@ -123,7 +123,7 @@ DeveloperToolbar.introShownThisSession = false;
  * @param aCallback show events can be asynchronous. If supplied aCallback will
  * be called when the DeveloperToolbar is visible
  */
-DeveloperToolbar.prototype.show = function DT_show(aCallback)
+DeveloperToolbar.prototype.show = function DT_show(aFocus, aCallback)
 {
   if (this._lastState != NOTIFICATIONS.HIDE) {
     return;
@@ -138,7 +138,7 @@ DeveloperToolbar.prototype.show = function DT_show(aCallback)
   let checkLoad = function() {
     if (this.tooltipPanel && this.tooltipPanel.loaded &&
         this.outputPanel && this.outputPanel.loaded) {
-      this._onload();
+      this._onload(aFocus);
     }
   }.bind(this);
 
@@ -151,7 +151,7 @@ DeveloperToolbar.prototype.show = function DT_show(aCallback)
  * Initializing GCLI can only be done when we've got content windows to write
  * to, so this needs to be done asynchronously.
  */
-DeveloperToolbar.prototype._onload = function DT_onload()
+DeveloperToolbar.prototype._onload = function DT_onload(aFocus)
 {
   this._doc.getElementById("Tools:DevToolbar").setAttribute("checked", "true");
 
@@ -193,7 +193,10 @@ DeveloperToolbar.prototype._onload = function DT_onload()
   this._initErrorsCount(this._chromeWindow.getBrowser().selectedTab);
 
   this._element.hidden = false;
-  this._input.focus();
+
+  if (aFocus) {
+    this._input.focus();
+  }
 
   this._notify(NOTIFICATIONS.SHOW);
   if (this._pendingShowCallback) {

diff --git a/browser/devtools/shared/test/head.js b/browser/devtools/shared/test/head.js
@@ -52,7 +52,7 @@ let DeveloperToolbarTest = {
       ok(false, "DeveloperToolbar.visible at start of openDeveloperToolbar");
     }
     else {
-      DeveloperToolbar.show(aCallback);
+      DeveloperToolbar.show(true, aCallback);
     }
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ let DeveloperToolbarTest = { @@
           ok(false, "DeveloperToolbar.visible at start of openDeveloperToolbar");
         }
         else {
-          DeveloperToolbar.show(aCallback);
+          DeveloperToolbar.show(true, aCallback);
         }
       },
@@ Expand Down @@