corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset b7531c106b59 (bug 1480934) for failing android at mobile/android/tests/browser/chrome/test_session_scroll_position.html on a CLOSED TREE

Browse Source
This commit is contained in:
Andreea Pavel
2018-08-14 08:22:04 +03:00
parent cbd27d9368
commit a21cdf67b1
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
toolkit/components/reader/AboutReader.jsm
View File

@@ -782,8 +782,8 @@ AboutReader.prototype = {
}, },
_showError() { _showError() {
this._headerElement.classList.remove("reader-show-element"); this._headerElement.style.display = "none";
this._contentElement.classList.remove("reader-show-element"); this._contentElement.style.display = "none";
let errorMessage = gStrings.GetStringFromName("aboutReader.loadError"); let errorMessage = gStrings.GetStringFromName("aboutReader.loadError");
this._messageElement.textContent = errorMessage; this._messageElement.textContent = errorMessage;
@@ -817,7 +817,7 @@ AboutReader.prototype = {
}, },
_showContent(article) { _showContent(article) {
this._messageElement.classList.remove("reader-show-element"); this._messageElement.style.display = "none";
this._article = article; this._article = article;
@@ -830,7 +830,7 @@ AboutReader.prototype = {
this._readTimeElement.textContent = this._formatReadTime(article.readingTimeMinsSlow, article.readingTimeMinsFast); this._readTimeElement.textContent = this._formatReadTime(article.readingTimeMinsSlow, article.readingTimeMinsFast);
this._doc.title = article.title; 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 parserUtils = Cc["@mozilla.org/parserutils;1"].getService(Ci.nsIParserUtils);
let contentFragment = parserUtils.parseFragment(article.content, let contentFragment = parserUtils.parseFragment(article.content,
@@ -841,7 +841,7 @@ AboutReader.prototype = {
this._maybeSetTextDirection(article); this._maybeSetTextDirection(article);
this._foundLanguage(article.language); this._foundLanguage(article.language);
this._contentElement.classList.add("reader-show-element"); this._contentElement.style.display = "block";
this._updateImageMargins(); this._updateImageMargins();
this._requestFavicon(); this._requestFavicon();
@@ -856,8 +856,8 @@ AboutReader.prototype = {
}, },
_hideContent() { _hideContent() {
this._headerElement.classList.remove("reader-show-element"); this._headerElement.style.display = "none";
this._contentElement.classList.remove("reader-show-element"); this._contentElement.style.display = "none";
}, },
_showProgressDelayed() { _showProgressDelayed() {
@@ -869,11 +869,11 @@ AboutReader.prototype = {
return; return;
} }
this._headerElement.classList.remove("reader-show-element"); this._headerElement.style.display = "none";
this._contentElement.classList.remove("reader-show-element"); this._contentElement.style.display = "none";
this._messageElement.textContent = gStrings.GetStringFromName("aboutReader.loading2"); this._messageElement.textContent = gStrings.GetStringFromName("aboutReader.loading2");
this._messageElement.classList.add("reader-show-element"); this._messageElement.style.display = "block";
}, 300); }, 300);
}, },

4
toolkit/themes/shared/aboutReader.css
View File

@@ -761,7 +761,3 @@ body:not(.loaded) .toolbar:-moz-locale-dir(rtl) {
margin: 0 .07em; margin: 0 .07em;
padding: 0; padding: 0;
} }
.reader-show-element {
display: initial;
}