wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1124271 - Entering reader mode from an app tab shouldn't open a new tab. r=jaws

Browse Source
This commit is contained in:
Matt Hammerly 2015-02-23 20:44:27 -08:00
parent 226a2aa6a9
commit a0ab2333b8
3 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/base/content/test/general/browser.ini
View File

@ -496,3 +496,6 @@ skip-if = e10s # bug 1100687 - test directly manipulates content (content.docume
[browser_readerMode.js]
support-files =
readerModeArticle.html
[browser_bug1124271_readerModePinnedTab.js]
support-files =
readerModeArticle.html

47
browser/base/content/test/general/browser_bug1124271_readerModePinnedTab.js Normal file
View File

@ -0,0 +1,47 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// Test that the reader mode button won't open in a new tab when clicked from a pinned tab
const PREF = "reader.parse-on-load.enabled";
const TEST_PATH = "http://example.com/browser/browser/base/content/test/general/";
let readerButton = document.getElementById("reader-mode-button");
add_task(function* () {
registerCleanupFunction(function() {
Services.prefs.clearUserPref(PREF);
while (gBrowser.tabs.length > 1) {
gBrowser.removeCurrentTab();
}
});
// Enable the reader mode button.
Services.prefs.setBoolPref(PREF, true);
let tab = gBrowser.selectedTab = gBrowser.addTab();
gBrowser.pinTab(tab);
let initialTabsCount = gBrowser.tabs.length;
// Point tab to a test page that is reader-able.
let url = TEST_PATH + "readerModeArticle.html";
yield promiseTabLoadEvent(tab, url);
yield promiseWaitForCondition(() => !readerButton.hidden);
readerButton.click();
yield promiseTabLoadEvent(tab);
// Ensure no new tabs are opened when exiting reader mode in a pinned tab
is(gBrowser.tabs.length, initialTabsCount, "No additional tabs were opened.");
readerButton.click();
yield promiseTabLoadEvent(tab);
// Ensure no new tabs are opened when exiting reader mode in a pinned tab
is(gBrowser.tabs.length, initialTabsCount, "No additional tabs were opened.");
gBrowser.removeCurrentTab();
});

4
browser/modules/ReaderParent.jsm
View File

@ -132,10 +132,10 @@ let ReaderParent = {
if (!originalURL) {
Cu.reportError("Error finding original URL for about:reader URL: " + url);
} else {
win.openUILinkIn(originalURL, "current");
win.openUILinkIn(originalURL, "current", {"allowPinnedTabHostChange": true});
}
} else {
win.openUILinkIn("about:reader?url=" + encodeURIComponent(url), "current");
win.openUILinkIn("about:reader?url=" + encodeURIComponent(url), "current", {"allowPinnedTabHostChange": true});
}
},