Bug 1124011 - Hide reader view buttons related to reading list if reading list is disabled, and enable reader view by default on Nightly. r=Unfocused

--HG--
extra : rebase_source : 53ebca45c92bb811b9ffa2e9faa33983c3dd1181
extra : histedit_source : c6cbbdccb6e057f0f06501ff517bad5ff687532e

browser/app/profile/firefox.js

@@ -1873,8 +1873,10 @@ pref("dom.ipc.reportProcessHangs", false);
 pref("dom.ipc.reportProcessHangs", true);
 #endif
 
+#ifndef NIGHTLY_BUILD
 // Disable reader mode by default.
 pref("reader.parse-on-load.enabled", false);
+#endif
 
 // Disable ReadingList by default.
 pref("browser.readinglist.enabled", false);

mobile/android/app/mobile.js

@@ -863,3 +863,6 @@ pref("reader.color_scheme.values", "[\"light\",\"dark\",\"auto\"]");
 
 // Whether to use a vertical or horizontal toolbar.
 pref("reader.toolbar.vertical", false);
+
+// Whether or not to display buttons related to reading list in reader view.
+pref("browser.readinglist.enabled", true);

toolkit/components/reader/AboutReader.jsm

@@ -57,9 +57,16 @@ let AboutReader = function(mm, win) {
 
   this._setupStyleDropdown();
   this._setupButton("close-button", this._onReaderClose.bind(this), "aboutReader.toolbar.close");
-  this._setupButton("toggle-button", this._onReaderToggle.bind(this), "aboutReader.toolbar.addToReadingList");
   this._setupButton("share-button", this._onShare.bind(this), "aboutReader.toolbar.share");
+
+  try {
+    if (Services.prefs.getBoolPref("browser.readinglist.enabled")) {
+      this._setupButton("toggle-button", this._onReaderToggle.bind(this), "aboutReader.toolbar.addToReadingList");
       this._setupButton("list-button", this._onList.bind(this), "aboutReader.toolbar.openReadingList");
+    }
+  } catch (e) {
+    // Pref doesn't exist.
+  }
 
   let colorSchemeValues = JSON.parse(Services.prefs.getCharPref("reader.color_scheme.values"));
   let colorSchemeOptions = colorSchemeValues.map((value) => {
@@ -699,6 +706,7 @@ AboutReader.prototype = {
 
   _setupButton: function Reader_setupButton(id, callback, titleEntity) {
     let button = this._doc.getElementById(id);
+    button.removeAttribute("hidden");
     button.setAttribute("title", gStrings.GetStringFromName(titleEntity));
 
     button.addEventListener("click", function(aEvent) {

toolkit/components/reader/content/aboutReader.html

@@ -38,8 +38,8 @@
         <div class="dropdown-arrow"/>
       </li>
     </ul>
-    <li><button id="toggle-button" class="button toggle-button"/></li>
-    <li><button id="list-button" class="button list-button"/></li>
+    <li><button id="toggle-button" class="button toggle-button" hidden="true"/></li>
+    <li><button id="list-button" class="button list-button" hidden="true"/></li>
   </ul>
 
 </body>

toolkit/themes/windows/global/aboutReader.css

@@ -248,6 +248,10 @@ body {
   border-bottom: 1px solid #c1c1c1;
 }
 
+.button[hidden] {
+  display: none;
+}
+
 .dropdown {
   text-align: center;
   list-style: none;