From a21cdf67b1544a1fd41724f6721311e0b9604713 Mon Sep 17 00:00:00 2001 From: Andreea Pavel Date: Tue, 14 Aug 2018 08:22:04 +0300 Subject: [PATCH] Backed out changeset b7531c106b59 (bug 1480934) for failing android at mobile/android/tests/browser/chrome/test_session_scroll_position.html on a CLOSED TREE --- toolkit/components/reader/AboutReader.jsm | 20 ++++++++++---------- toolkit/themes/shared/aboutReader.css | 4 ---- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/toolkit/components/reader/AboutReader.jsm b/toolkit/components/reader/AboutReader.jsm index 7f22e86b6635..7b161bbd6917 100644 --- a/toolkit/components/reader/AboutReader.jsm +++ b/toolkit/components/reader/AboutReader.jsm @@ -782,8 +782,8 @@ AboutReader.prototype = { }, _showError() { - this._headerElement.classList.remove("reader-show-element"); - this._contentElement.classList.remove("reader-show-element"); + this._headerElement.style.display = "none"; + this._contentElement.style.display = "none"; let errorMessage = gStrings.GetStringFromName("aboutReader.loadError"); this._messageElement.textContent = errorMessage; @@ -817,7 +817,7 @@ AboutReader.prototype = { }, _showContent(article) { - this._messageElement.classList.remove("reader-show-element"); + this._messageElement.style.display = "none"; this._article = article; @@ -830,7 +830,7 @@ AboutReader.prototype = { this._readTimeElement.textContent = this._formatReadTime(article.readingTimeMinsSlow, article.readingTimeMinsFast); this._doc.title = article.title; - this._headerElement.classList.add("reader-show-element"); + this._headerElement.style.display = "block"; let parserUtils = Cc["@mozilla.org/parserutils;1"].getService(Ci.nsIParserUtils); let contentFragment = parserUtils.parseFragment(article.content, @@ -841,7 +841,7 @@ AboutReader.prototype = { this._maybeSetTextDirection(article); this._foundLanguage(article.language); - this._contentElement.classList.add("reader-show-element"); + this._contentElement.style.display = "block"; this._updateImageMargins(); this._requestFavicon(); @@ -856,8 +856,8 @@ AboutReader.prototype = { }, _hideContent() { - this._headerElement.classList.remove("reader-show-element"); - this._contentElement.classList.remove("reader-show-element"); + this._headerElement.style.display = "none"; + this._contentElement.style.display = "none"; }, _showProgressDelayed() { @@ -869,11 +869,11 @@ AboutReader.prototype = { return; } - this._headerElement.classList.remove("reader-show-element"); - this._contentElement.classList.remove("reader-show-element"); + this._headerElement.style.display = "none"; + this._contentElement.style.display = "none"; this._messageElement.textContent = gStrings.GetStringFromName("aboutReader.loading2"); - this._messageElement.classList.add("reader-show-element"); + this._messageElement.style.display = "block"; }, 300); }, diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css index 9dc31c2d63e2..50e96f1f6d52 100644 --- a/toolkit/themes/shared/aboutReader.css +++ b/toolkit/themes/shared/aboutReader.css @@ -761,7 +761,3 @@ body:not(.loaded) .toolbar:-moz-locale-dir(rtl) { margin: 0 .07em; padding: 0; } - -.reader-show-element { - display: initial; -}