Bug 997625 - Sync panel: Checkbox for syncing passwords enabled (not disabled) while sync credentials need reauth r=ttaubert a=sylvestre
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 17 Apr 2014 13:55:31 +0200
changeset 183794 0add478cf3b4
parent 183793 034a63535df0
child 183795 7f0030f9aac0
push id3487
push userttaubert@mozilla.com
push date2014-04-17 19:23 +0000
treeherdermozilla-beta@0add478cf3b4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersttaubert, sylvestre
bugs997625
milestone29.0
Bug 997625 - Sync panel: Checkbox for syncing passwords enabled (not disabled) while sync credentials need reauth r=ttaubert a=sylvestre
browser/components/preferences/in-content/sync.js
browser/components/preferences/sync.js
--- a/browser/components/preferences/in-content/sync.js
+++ b/browser/components/preferences/in-content/sync.js
@@ -158,18 +158,18 @@ let gSyncPane = {
         let checkbox = document.getElementById("fxa-pweng-chk");
         let help = document.getElementById("fxa-pweng-help");
         let allowPasswordsEngine = service.allowPasswordsEngine;
 
         if (!allowPasswordsEngine) {
           checkbox.checked = false;
         }
 
-        checkbox.disabled = !allowPasswordsEngine;
-        help.hidden = allowPasswordsEngine;
+        checkbox.disabled = !allowPasswordsEngine || enginesListDisabled;
+        help.hidden = allowPasswordsEngine || enginesListDisabled;
       });
     // If fxAccountEnabled is false and we are in a "not configured" state,
     // then fxAccounts is probably fully disabled rather than just unconfigured,
     // so handle this case.  This block can be removed once we remove support
     // for fxAccounts being disabled.
     } else if (Weave.Status.service == Weave.CLIENT_NOT_CONFIGURED ||
                Weave.Svc.Prefs.get("firstSync", "") == "notReady") {
       this.page = PAGE_NO_ACCOUNT;
--- a/browser/components/preferences/sync.js
+++ b/browser/components/preferences/sync.js
@@ -158,18 +158,18 @@ let gSyncPane = {
         let checkbox = document.getElementById("fxa-pweng-chk");
         let help = document.getElementById("fxa-pweng-help");
         let allowPasswordsEngine = service.allowPasswordsEngine;
 
         if (!allowPasswordsEngine) {
           checkbox.checked = false;
         }
 
-        checkbox.disabled = !allowPasswordsEngine;
-        help.hidden = allowPasswordsEngine;
+        checkbox.disabled = !allowPasswordsEngine || enginesListDisabled;
+        help.hidden = allowPasswordsEngine || enginesListDisabled;
       });
     // If fxAccountEnabled is false and we are in a "not configured" state,
     // then fxAccounts is probably fully disabled rather than just unconfigured,
     // so handle this case.  This block can be removed once we remove support
     // for fxAccounts being disabled.
     } else if (Weave.Status.service == Weave.CLIENT_NOT_CONFIGURED ||
                Weave.Svc.Prefs.get("firstSync", "") == "notReady") {
       this.page = PAGE_NO_ACCOUNT;