Fixed a focus bug using the other test site field

diff --git a/content/quickbox.js b/content/quickbox.js
index 2c4164bbbc6eb72fe42111a29ccb992b1cf8a242..1a57e2044a6b896fd503b706560f81c2be640a37 100644 (file)
--- a/content/quickbox.js
+++ b/content/quickbox.js
@@ -84,15 +84,17 @@ var TV2DeveloperQuickBox = {
     },
     
     /* Change action manually */
-    setManuel: function(target) {
+    setManuel: function(target, doReturnFocus) {
+         if (typeof doReturnFocus == 'undefined') doReturnFocus = true;
         var action = document.getElementById('action').selectedItem.id;
         var makeSiteURL = this._shouldMakeURL(action);
         var environment = document.getElementById('environment').selectedItem;
         if (target.id == 'environment') {
             document.getElementById('testname').disabled = (target.selectedItem.id != 'othertest');
-            if (!this._autoChange) {
+            if (!this._autoChange && (target.selectedItem.id == 'othertest')) {
                 document.getElementById('testname').select();
                 document.getElementById('testname').focus();
+                doReturnFocus = false;
             }
         }
         if (target.id == 'action') {
@@ -110,7 +112,9 @@ var TV2DeveloperQuickBox = {
                         document.getElementById('othertest');
             }
             this.updateQuickbox(true);
-            document.getElementById('shorturl').focus();
+            if (doReturnFocus) {
+                document.getElementById('shorturl').focus();
+            }
         }
     },
 

diff --git a/content/quickbox.xul b/content/quickbox.xul
index 5309f4d915938fa90eed9fcf129b04779375f906..9f30864b3befea5a97e758f3e677f72d13ed2c4a 100644 (file)
--- a/content/quickbox.xul
+++ b/content/quickbox.xul
@@ -42,8 +42,8 @@
           <hbox>
             <radio id="othertest" label="&quickbox.othertestsite;" accesskey="&quickbox.othertestsite.accesskey;"/>
             <textbox id="testname" size="10" maxlength="20" disabled="true"
-                onclick="TV2DeveloperQuickBox.setManuel(this)"
-                oninput="TV2DeveloperQuickBox.setManuel(this)"/>
+                onclick="TV2DeveloperQuickBox.setManuel(this, false)"
+                oninput="TV2DeveloperQuickBox.setManuel(this, false)"/>
           </hbox>
         </radiogroup>
       </groupbox>