Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 09:54:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1330745 - Add 'No Container' when longPressBehaviour is 1 for containers new tab context menu. r=baku,Gijs

Browse Source 
MozReview-Commit-ID: I2ptF9Dh7yL

--HG--
extra : rebase_source : ff586de60c0a172d766259c10fe136242b75d647
This commit is contained in:
Jonathan Kingston 2017-09-25 14:34:13 +01:00
parent 23296a78c9
commit 9f55478dda
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/base/content/tabbrowser.xml
View File

@ -8192,7 +8192,10 @@
if (event.target.getAttribute("anonid") == "newtab-popup" ||
event.target.id == "newtab-popup") {
createUserContextMenu(event, {useAccessKeys: false});
createUserContextMenu(event, {
useAccessKeys: false,
showDefaultTab: Services.prefs.getIntPref("privacy.userContext.longPressBehavior") == 1
});
} else {
document.getElementById("alltabs-popup-separator-1").hidden = !containersEnabled;
let containersTab = document.getElementById("alltabs_containersTab");

3
browser/base/content/utilityOverlay.js
View File

@ -526,6 +526,7 @@ function checkForMiddleClick(node, event) {
function createUserContextMenu(event, {
isContextMenu = false,
excludeUserContextId = 0,
showDefaultTab = false,
useAccessKeys = true
} = {}) {
while (event.target.hasChildNodes()) {
@ -536,7 +537,7 @@ function createUserContextMenu(event, {
let docfrag = document.createDocumentFragment();
// If we are excluding a userContextId, we want to add a 'no-container' item.
if (excludeUserContextId) {
if (excludeUserContextId || showDefaultTab) {
let menuitem = document.createElement("menuitem");
menuitem.setAttribute("data-usercontextid", "0");
menuitem.setAttribute("label", bundle.getString("userContextNone.label"));

27
browser/components/contextualidentity/test/browser/browser_newtabButton.js
View File

@ -48,8 +48,18 @@ add_task(async function test_menu_without_timeout() {
await BrowserTestUtils.waitForCondition(() => !!document.getAnonymousElementByAttribute(newTab, "anonid", "newtab-popup"), "Wait for popup to exist");
let popup = document.getAnonymousElementByAttribute(newTab, "anonid", "newtab-popup");
for (let i = 1; i <= 4; i++) {
let popupShownPromise = BrowserTestUtils.waitForEvent(popup, "popupshown");
let popupShownPromise = BrowserTestUtils.waitForEvent(popup, "popupshown");
let popupHiddenPromise = BrowserTestUtils.waitForEvent(popup, "popuphidden");
EventUtils.synthesizeMouseAtCenter(newTabButton, {type: "mousedown"});
await popupShownPromise;
let contextIdItems = popup.querySelectorAll("menuitem");
// 4 + default + manage containers
is(contextIdItems.length, 6, "Has 6 menu items");
popup.hidePopup();
await popupHiddenPromise;
for (let i = 0; i <= 4; i++) {
popupShownPromise = BrowserTestUtils.waitForEvent(popup, "popupshown");
EventUtils.synthesizeMouseAtCenter(newTabButton, {type: "mousedown"});
await popupShownPromise;
@ -57,12 +67,17 @@ add_task(async function test_menu_without_timeout() {
ok(contextIdItem, `User context id ${i} exists`);
let waitForTabPromise = BrowserTestUtils.waitForNewTab(gBrowser);
// waitForNewTab doesn't work for default tabs due to a different code path that doesn't cause a load event
let waitForTabPromise = BrowserTestUtils.waitForEvent(gBrowser.tabContainer, "TabOpen");
EventUtils.synthesizeMouseAtCenter(contextIdItem, {});
let tab = await waitForTabPromise;
is(tab.getAttribute("usercontextid"), i, `New tab has UCI equal ${i}`);
let tabEvent = await waitForTabPromise;
let tab = tabEvent.target;
if (i > 0) {
is(tab.getAttribute("usercontextid"), i, `New tab has UCI equal ${i}`);
} else {
ok(!tab.hasAttribute("usercontextid"), `New tab has no UCI`);
}
await BrowserTestUtils.removeTab(tab);
}
});