author | Phil Ringnalda <philringnalda@gmail.com> |
Sun, 22 Feb 2015 22:00:56 -0800 | |
changeset 259120 | 28ff18b517ee579aabc6da99c6fb1a09f3724b6a |
parent 257374 | c25eff2d6122eea3ac443cec7e3b1ef57f118aef |
child 259121 | c02c4fcfeb78c214b105a6b3a82f5b7c17cc4994 |
push id | 4718 |
push user | raliiev@mozilla.com |
push date | Mon, 11 May 2015 18:39:53 +0000 |
treeherder | mozilla-beta@c20c4ef55f08 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1124011 |
milestone | 38.0a1 |
backs out | 66cf24f275b75f0b28c0532d5b95333bfbdf961a |
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
|
--- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -1868,15 +1868,13 @@ pref("dom.ipc.processHangMonitor", true) #ifdef DEBUG // Don't report hangs in DEBUG builds. They're too slow and often a // debugger is attached. pref("dom.ipc.reportProcessHangs", false); #else 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);
--- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -853,11 +853,8 @@ pref("media.gmp-provider.enabled", true) // (auto only works on platforms where the 'devicelight' event is enabled) pref("reader.color_scheme", "auto"); // Color scheme values available in reader mode UI. 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);
--- a/toolkit/components/reader/AboutReader.jsm +++ b/toolkit/components/reader/AboutReader.jsm @@ -52,26 +52,19 @@ let AboutReader = function(mm, win) { win.addEventListener("unload", this, false); win.addEventListener("scroll", this, false); win.addEventListener("resize", this, false); doc.addEventListener("visibilitychange", this, false); 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. - } + this._setupButton("list-button", this._onList.bind(this), "aboutReader.toolbar.openReadingList"); let colorSchemeValues = JSON.parse(Services.prefs.getCharPref("reader.color_scheme.values")); let colorSchemeOptions = colorSchemeValues.map((value) => { return { name: gStrings.GetStringFromName("aboutReader.colorScheme." + value), value: value, itemClass: value + "-button" }; }); @@ -701,17 +694,16 @@ AboutReader.prototype = { if (option.value === initialValue) item.classList.add("selected"); } }, _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) { if (!aEvent.isTrusted) return; aEvent.stopPropagation(); callback();
--- a/toolkit/components/reader/content/aboutReader.html +++ b/toolkit/components/reader/content/aboutReader.html @@ -33,15 +33,15 @@ <ul id="font-type-buttons"></ul> <hr></hr> <ul id="font-size-buttons" class="segmented-button"></ul> <hr></hr> <ul id="color-scheme-buttons" class="segmented-button"></ul> <div class="dropdown-arrow"/> </li> </ul> - <li><button id="toggle-button" class="button toggle-button" hidden="true"/></li> - <li><button id="list-button" class="button list-button" hidden="true"/></li> + <li><button id="toggle-button" class="button toggle-button"/></li> + <li><button id="list-button" class="button list-button"/></li> </ul> </body> </html>
--- a/toolkit/themes/windows/global/aboutReader.css +++ b/toolkit/themes/windows/global/aboutReader.css @@ -243,20 +243,16 @@ body { height: 40px; width: 40px; border-top: 0; border-left: 0; border-right: 0; border-bottom: 1px solid #c1c1c1; } -.button[hidden] { - display: none; -} - .dropdown { text-align: center; list-style: none; margin: 0px; padding: 0px; } .dropdown li {