Bug 1443593 - Remove FxA preferences from search results when FxA is disabled. r=markh
authorEdouard Oger <eoger@fastmail.com>
Fri, 09 Mar 2018 14:36:59 -0500
changeset 407806 294b15b9d3c028e0c5925020d68bea342a2f4d2f
parent 407805 df0f954838461455e28c86e7279332cca1afb39a
child 407807 7ce340e02ccca784a9e848cfbd3d6957a583355b
child 407956 deb7714a7bcd3448952440e92d0209abec6b886d
push id61055
push usereoger@mozilla.com
push dateTue, 13 Mar 2018 13:59:42 +0000
treeherderautoland@294b15b9d3c0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarkh
bugs1443593
milestone61.0a1
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
Bug 1443593 - Remove FxA preferences from search results when FxA is disabled. r=markh MozReview-Commit-ID: 3x5wuJLDVWN
browser/components/preferences/in-content/preferences.js
browser/components/preferences/in-content/sync.xul
--- a/browser/components/preferences/in-content/preferences.js
+++ b/browser/components/preferences/in-content/preferences.js
@@ -52,16 +52,17 @@ function init_all() {
 
   gSubDialog.init();
   register_module("paneGeneral", gMainPane);
   register_module("paneSearch", gSearchPane);
   register_module("panePrivacy", gPrivacyPane);
   register_module("paneContainers", gContainersPane);
   if (Services.prefs.getBoolPref("identity.fxaccounts.enabled")) {
     document.getElementById("category-sync").hidden = false;
+    document.getElementById("weavePrefsDeck").removeAttribute("data-hidden-from-search");
     register_module("paneSync", gSyncPane);
   }
   register_module("paneSearchResults", gSearchResultsPane);
   gSearchResultsPane.init();
   gMainPane.preInit();
 
   let categories = document.getElementById("categories");
   categories.addEventListener("select", event => gotoPref(event.target.value));
--- a/browser/components/preferences/in-content/sync.xul
+++ b/browser/components/preferences/in-content/sync.xul
@@ -9,17 +9,18 @@
 
 <hbox id="firefoxAccountCategory"
       class="subcategory"
       hidden="true"
       data-category="paneSync">
   <label class="header-name" flex="1">&paneSync1.title;</label>
 </hbox>
 
-<deck id="weavePrefsDeck" data-category="paneSync" hidden="true">
+<deck id="weavePrefsDeck" data-category="paneSync" hidden="true"
+      data-hidden-from-search="true">
   <groupbox id="noFxaAccount">
     <hbox>
       <vbox flex="1">
         <caption><label id="noFxaCaption">&signedOut.caption;</label></caption>
         <description id="noFxaDescription" flex="1">&signedOut.description;</description>
       </vbox>
       <vbox>
         <image class="fxaSyncIllustration"/>