Bug 303152 - Update prefs UI is broken. r=mconnor.

browser/components/preferences/advanced.js

@@ -102,23 +102,22 @@ var gAdvancedPane = {
    * 
    * UI Components:                                     Preferences
    * 1 = Firefox checkbox                               i   = app.update.enabled
-   * 2 = Check Now button for Firefox                   ii  = app.update.auto
-   * 3 = When updates for Firefox are found label       iii = app.update.mode
-   * 4 = Automatic Radiogroup (Ask vs. Automatically)
-   * 5 = Warn before disabling extensions checkbox
+   * 2 = When updates for Firefox are found label       ii  = app.update.auto
+   * 3 = Automatic Radiogroup (Ask vs. Automatically)   iii = app.update.mode
+   * 4 = Warn before disabling extensions checkbox
    * 
    * States:
    * Element     p   val     locked    Disabled 
-   * 1,2         i   t/f     f         false 
+   * 1           i   t/f     f         false
    *             i   t/f     t         true
    *             ii  t/f     t/f       false
    *             iii 0/1/2   t/f       false
-   * 3,4         i   t       t/f       false
+   * 2,3         i   t       t/f       false
    *             i   f       t/f       true
    *             ii  t/f     f         false
    *             ii  t/f     t         true
    *             iii 0/1/2   t/f       false
-   * 5           i   t       t/f       false
+   * 4           i   t       t/f       false
    *             i   f       t/f       true
    *             ii  t       t/f       false
    *             ii  f       t/f       true
@@ -133,10 +132,9 @@ var gAdvancedPane = {
         getService(Components.interfaces.nsIApplicationUpdateService);
 
     var enabledPref = document.getElementById("app.update.enabled");
-    
     var enableAppUpdate = document.getElementById("enableAppUpdate");
-    var appCheckNowButton = document.getElementById("appCheckNowButton");
-    appCheckNowButton.disabled = enableAppUpdate.disabled = !aus.canUpdate;
+
+    enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked;
   },
   
   updateAutoItems: function () 
@@ -147,7 +145,8 @@ var gAdvancedPane = {
     var updateModeLabel = document.getElementById("updateModeLabel");
     var updateMode = document.getElementById("updateMode");
     
-    var disable = !enabledPref.value || autoPref.locked;
+    var disable = enabledPref.locked || !enabledPref.value ||
+                  autoPref.locked;
     updateModeLabel.disabled = updateMode.disabled = disable;
   },
 
@@ -159,7 +158,8 @@ var gAdvancedPane = {
     
     var warnIncompatible = document.getElementById("warnIncompatible");
     
-    var disable = !enabledPref.value || !autoPref.value || modePref.locked;
+    var disable = enabledPref.locked || !enabledPref.value || autoPref.locked ||
+                  !autoPref.value || modePref.locked;
     warnIncompatible.disabled = disable;
   },
 
@@ -170,10 +170,9 @@ var gAdvancedPane = {
   updateAddonUpdateUI: function ()
   {
     var enabledPref = document.getElementById("extensions.update.enabled");
-    
     var enableAddonUpdate = document.getElementById("enableAddonUpdate");
-    var addonCheckNowButton = document.getElementById("addonCheckNowButton");
-    enableAddonUpdate.disabled = addonCheckNowButton.disabled = enabledPref.locked;
+
+    enableAddonUpdate.disabled = enabledPref.locked;
   },  
 
   /**
@@ -214,4 +213,3 @@ var gAdvancedPane = {
                                            "", null);  
   }
 };
-

browser/components/preferences/advanced.xul

@@ -144,24 +144,18 @@
         <tabpanel orient="vertical" align="start">
           <label control="autoUpdateGroup">&autoCheck.label;</label>
           <vbox class="indent" id="autoUpdateGroup" xhtml2:role="wairole:groupbox">
-            <hbox>
             <checkbox id="enableAppUpdate"
                       label="&enableAppUpdate.label;"
                       accesskey="&enableAppUpdate.accesskey;"
                       preference="app.update.enabled"/>
-            </hbox>
-            <hbox>
             <checkbox id="enableAddonUpdate"
                       label="&enableExtensionUpdate.label;"
                       accesskey="&enableExtensionUpdate.accesskey;"
                       preference="extensions.update.enabled"/>
-            </hbox>
-            <hbox>
             <checkbox id="enableSearchUpdate"
                       label="&enableSearchUpdate.label;"
                       accesskey="&enableSearchUpdate.accesskey;"
                       preference="browser.search.update"/>
-            </hbox>
           </vbox>
           <separator/>
           <label id="updateModeLabel" control="updateMode">&whenUpdatesFound.label;</label>