Fix bug 193835: Missing focus when selected the related checkbox or radiobox in Preference window. p=jessie.li@sun.com,r=neil@parkwaycc.co.uk,sr=jag.

extensions/cookie/resources/content/pref-cookies.xul

@@ -18,7 +18,7 @@
    Rights Reserved.
    
    Contributor(s):
-     Håkan Waara <hwaara@chello.se>
+     Håkan Waara <hwaara@chello.se>
      Peter Annema <disttsc@bart.nl>
   -->
 
@@ -41,7 +41,7 @@
   function init()
   {
     parent.initPanel('chrome://cookie/content/pref-cookies.xul');
-    setDisables();
+    setDisables(false);
 
     const NS_COOKIECONSENT_CONTRACTID = '@mozilla.org/cookie-consent;1';
     if (NS_COOKIECONSENT_CONTRACTID in Components.classes) {
@@ -56,7 +56,7 @@
   const cookies_p3p = "3";
   const cookies_enabled = "0";
 
-  function setDisables()
+  function setDisables(setFocus)
   {
     var cookieBehavior = document.getElementById("networkCookieBehaviour");
 
@@ -97,7 +97,7 @@
     if (parent.hPrefWindow.getPrefIsLocked(lifetimeDays.getAttribute("prefstring")) )
       lifetimeDays.disabled = true;
     
-    if (! lifetimeDays.disabled)
+    if (!lifetimeDays.disabled && setFocus)
       lifetimeDays.focus();
   }
   ]]>
@@ -107,18 +107,18 @@
     <radiogroup id="networkCookieBehaviour"
                 prefstring="network.cookie.cookieBehavior">
       <radio value="2" label="&disableCookies.label;"
-             accesskey="&disableCookies.accesskey;" oncommand="setDisables();"/>
+             accesskey="&disableCookies.accesskey;" oncommand="setDisables(false);"/>
       <radio value="1" label="&accOrgCookiesRadio.label;"
-             accesskey="&accOrgCookiesRadio.accesskey;" oncommand="setDisables();"/>
+             accesskey="&accOrgCookiesRadio.accesskey;" oncommand="setDisables(false);"/>
       <hbox id="p3pRadioButton" hidden="true">
         <radio value="3" label="&accP3PCookiesRadio.label;"
-               accesskey="&accP3PCookiesRadio.accesskey;" oncommand="setDisables();"/>
+               accesskey="&accP3PCookiesRadio.accesskey;" oncommand="setDisables(false);"/>
         <button label="&viewP3P.label;" accesskey="&viewP3P.accesskey;" oncommand="viewP3P();"
                 id="p3pDialog"
                 prefstring="pref.advanced.cookies.disable_button.more_info"/>
       </hbox>
       <radio value="0" label="&accAllCookiesRadio.label;"
-             accesskey="&accAllCookiesRadio.accesskey;" oncommand="setDisables();"/>
+             accesskey="&accAllCookiesRadio.accesskey;" oncommand="setDisables(false);"/>
     </radiogroup>
     <separator id="networkCookieBehaviorSeparator"/>
     <vbox align="start">
@@ -126,15 +126,15 @@
                 prefstring="network.cookie.warnAboutCookies"/>
       <checkbox id="lifetimeEnabled" label="&limitLifetime.label;" accesskey="&limitLifetime.accesskey;"
                 prefstring="network.cookie.lifetime.enabled"
-                oncommand="setDisables();"/>
+                oncommand="setDisables(false);"/>
       <hbox class="indent">
         <radiogroup id="lifetimeBehavior" prefstring="network.cookie.lifetime.behavior">
           <radio value="0" label="&current.label;" 
                  accesskey="&current.accesskey;"
-                 oncommand="setDisables();"/>
+                 oncommand="setDisables(false);"/>
           <hbox>
             <radio value="1" accesskey="&days.accesskey;"
-                    oncommand="setDisables();"/>
+                    oncommand="setDisables(true);"/>
             <textbox id="lifetimeDays" pref="true" size="4"
                      preftype="int" prefstring="network.cookie.lifetime.days"/>
             <description>&days.label;</description>

xpfe/components/prefwindow/resources/content/pref-advanced.xul

@@ -38,16 +38,16 @@
     var _elementIDs = ["advancedJavaAllow", "advancedMailFTP", "advancedMailFTPAddress"];
     
     function Startup() {
-      ftpCheck();
+      ftpCheck(false);
       turboCheck();
     }   
     
-    function ftpCheck() {
+    function ftpCheck(setFocus) {
       var checked = document.getElementById("advancedMailFTP").checked;
       var field = document.getElementById("advancedMailFTPAddress");
       field.disabled = !checked;
 
-      if (! field.disabled)
+      if (!field.disabled && setFocus)
         field.focus();
     }
 
@@ -145,7 +145,7 @@
     <vbox align="start">
       <checkbox id="advancedMailFTP" label="&sendAddFtpCheck.label;" accesskey="&sendAddFtpCheck.accesskey;"
                 prefstring="advanced.mailftp"
-                oncommand="ftpCheck();"/>
+                oncommand="ftpCheck(true);"/>
     </vbox>
     <hbox class="indent">
       <textbox id="advancedMailFTPAddress"

xpfe/components/prefwindow/resources/content/pref-mousewheel.xul

@@ -69,7 +69,7 @@
     }
   }  
   
-   function enableField(aCheckbox, aNodeID) 
+   function enableField(aCheckbox, aNodeID, setFocus) 
    { 
      var el = document.getElementById(aNodeID); 
      if (aCheckbox.checked) 
@@ -77,7 +77,7 @@
      else 
        el.removeAttribute("disabled"); 
 
-     if (!el.disabled)
+     if (!el.disabled && setFocus)
        el.focus();
    } 
 
@@ -123,7 +123,7 @@
             </hbox>
             <checkbox id="mousewheelWithNoKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
                       prefstring="mousewheel.withnokey.sysnumlines"
-                      oncommand="enableField(this, 'mousewheelWithNoKeyNumlines');"/>
+                      oncommand="enableField(this, 'mousewheelWithNoKeyNumlines', true);"/>
           </vbox>
         </hbox>
         <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
@@ -144,7 +144,7 @@
             </hbox>
             <checkbox id="mousewheelWithAltKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
                       prefstring="mousewheel.withaltkey.sysnumlines"
-                      oncommand="enableField(this, 'mousewheelWithAltKeyNumlines');"/>
+                      oncommand="enableField(this, 'mousewheelWithAltKeyNumlines', true);"/>
           </vbox>
         </hbox>
         <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
@@ -165,7 +165,7 @@
             </hbox>
             <checkbox id="mousewheelWithCtrlKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
                       prefstring="mousewheel.withcontrolkey.sysnumlines"
-                      oncommand="enableField(this, 'mousewheelWithCtrlKeyNumlines');"/>
+                      oncommand="enableField(this, 'mousewheelWithCtrlKeyNumlines', true);"/>
           </vbox>
         </hbox>
         <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
@@ -185,7 +185,7 @@
             </hbox>
             <checkbox id="mousewheelWithShiftKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
                       prefstring="mousewheel.withshiftkey.sysnumlines"
-                      oncommand="enableField(this, 'mousewheelWithShiftKeyNumlines');"/>
+                      oncommand="enableField(this, 'mousewheelWithShiftKeyNumlines', true);"/>
           </vbox>
         </hbox>
         <radio value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>

xpfe/components/prefwindow/resources/content/pref-offline.xul

@@ -38,15 +38,14 @@
   <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["offlineStartupstate", "whengoingOnlinestate", "whengoingOfflinestate", "offlineCompactFolder", "offlineCompactFolderMin"];
-  ]]>
     
   function Startup()
   {
     var aCheckbox = document.getElementById("offlineCompactFolder");
-    enableField(aCheckbox, "offlineCompactFolderMin");
+    enableField(aCheckbox, "offlineCompactFolderMin", false);
   }
 
-  function enableField(aCheckbox, aNodeID) 
+  function enableField(aCheckbox, aNodeID, setFocus) 
   { 
      var aField = document.getElementById(aNodeID); 
      if (aCheckbox.checked) 
@@ -54,10 +53,10 @@
      else 
          aField.setAttribute("disabled", "true"); 
     
-     if (! aField.disabled)
+     if (!aField.disabled && setFocus)
        aField.focus();
   } 
-
+  ]]>
   </script>
 
 <groupbox>
@@ -96,7 +95,7 @@
     <hbox align="center">
         <checkbox id="offlineCompactFolder" label="&offlineCompact.label;" accesskey="&offlineCompact.accesskey;"
             prefstring="mail.prompt_purge_threshhold"
-            oncommand="enableField(this,'offlineCompactFolderMin');"/> 
+            oncommand="enableField(this,'offlineCompactFolderMin',true);"/> 
         <textbox id="offlineCompactFolderMin" size="5" value="100"
             preftype="int" prefstring="mail.purge_threshhold"/>
         <label value="&kb.label;"/>