merge backout
authorRob Campbell <rcampbell@mozilla.com>
Fri, 23 Jul 2010 11:30:40 -0300
changeset 48128 d8d0b2de29c920e93455fea0e3a25113ac904e6c
parent 48126 bcae411bc333534774a1be0cc1be46220f04c718 (current diff)
parent 48127 e48845de46aca9dfcb006f4430326dbdba9d5fb5 (diff)
child 48129 0b282467a4adb0cb6bfb274c1e5889d9ef43bd85
push id14586
push userrcampbell@mozilla.com
push dateFri, 23 Jul 2010 14:31:07 +0000
treeherdermozilla-central@d8d0b2de29c9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b3pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
merge backout
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -1517,17 +1517,16 @@ function HeadsUpDisplay(aConfig)
 
   if (aConfig.consoleOnly) {
     this.HUDBox = aConfig.hudNode;
     this.parentNode = aConfig.hudNode.parentNode;
     this.notificationBox = this.parentNode;
     this.contentWindow = aConfig.contentWindow;
     this.uriSpec = aConfig.contentWindow.location.href;
     this.reattachConsole();
-    this.jsterm.inputNode.focus();
     return;
   }
 
   this.HUDBox = null;
 
   if (aConfig.parentNode) {
     // TODO: need to replace these DOM calls with internal functions
     // that operate on each application's node structure
@@ -1623,17 +1622,16 @@ function HeadsUpDisplay(aConfig)
 
   let console = this.createConsole();
 
   this.contentWindow.wrappedJSObject.console = console;
 
   // create the JSTerm input element
   try {
     this.createConsoleInput(this.contentWindow, this.consoleWrap, this.outputNode);
-    this.jsterm.inputNode.focus();
   }
   catch (ex) {
     Cu.reportError(ex);
   }
 }
 
 HeadsUpDisplay.prototype = {
   /**