mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 2b2e72856dc1 (bug 1665237) for perma failures on browser_popupNode.js. CLOSED TREE

This commit is contained in:
Razvan Maries 2020-09-25 06:03:12 +03:00
Родитель 7deab48aeb
Коммит 7979196254
8 изменённых файлов: 194 добавлений и 261 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

119
browser/base/content/browser-places.js
Просмотреть файл

@ -1279,10 +1279,123 @@ var PlacesToolbarHelper = {
}
},
openManagedBookmark(event) {
openUILink(event.target.link, event, {
triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
updateManagedBookmarksContextMenu(popup) {
let hiddenContainerItems = [
"placesContextManaged_openSeparator",
"placesContextManaged_open:newtab",
"placesContextManaged_open:newwindow",
"placesContextManaged_copy",
];
if (
popup.triggerNode.id == "managed-bookmarks" &&
!popup.triggerNode.menupopup.hasAttribute("hasbeenopened")
) {
this.populateManagedBookmarks(popup.triggerNode.menupopup);
}
let isContainer = popup.triggerNode.getAttribute("container") == "true";
document.getElementById(
"placesContextManaged_openContainer:tabs"
).hidden = !isContainer;
let openContainerInTabs = false;
if (isContainer) {
let menuitems = popup.triggerNode.menupopup.children;
openContainerInTabs = Array.from(menuitems).some(
menuitem => menuitem.link
);
}
document.getElementById(
"placesContextManaged_openContainer:tabs"
).disabled = !openContainerInTabs;
document.getElementById(
"placesContextManaged_open:newprivatewindow"
).hidden = isContainer || PrivateBrowsingUtils.isWindowPrivate(window);
hiddenContainerItems.forEach(
id => (document.getElementById(id).hidden = isContainer)
);
},
openManagedBookmark(event, where, private = false) {
event = getRootEvent(event);
if (where) {
openUILinkIn(event.target.parentNode.triggerNode.link, where, {
triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
private,
});
} else {
openUILink(event.target.link, event, {
triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
});
}
},
openManagedFolder(event) {
let menuitems = event.target.parentNode.triggerNode.menupopup.children;
let items = [];
for (let i = 0; i < menuitems.length; i++) {
if (menuitems[i].link) {
let item = {};
item.uri = menuitems[i].link;
item.isBookmark = true;
items.push(item);
}
}
PlacesUIUtils.openTabset(items, event, window);
},
copyManagedBookmark(event) {
// This is a little hacky, but there is a lot of code in Places that handles
// clipboard stuff, so it's easier to reuse.
let node = {};
node.type = 0;
node.title = event.target.parentNode.triggerNode.label;
node.uri = event.target.parentNode.triggerNode.link;
// Copied from _populateClipboard in controller.js
// This order is _important_! It controls how this and other applications
// select data to be inserted based on type.
let contents = [
{ type: PlacesUtils.TYPE_X_MOZ_URL, entries: [] },
{ type: PlacesUtils.TYPE_HTML, entries: [] },
{ type: PlacesUtils.TYPE_UNICODE, entries: [] },
];
contents.forEach(function(content) {
content.entries.push(PlacesUtils.wrapNode(node, content.type));
});
function addData(type, data) {
xferable.addDataFlavor(type);
xferable.setTransferData(
type,
PlacesUtils.toISupportsString(data),
data.length * 2
);
}
let xferable = Cc["@mozilla.org/widget/transferable;1"].createInstance(
Ci.nsITransferable
);
xferable.init(null);
let hasData = false;
// This order matters here! It controls how this and other applications
// select data to be inserted based on type.
contents.forEach(function(content) {
if (content.entries.length) {
hasData = true;
let glue = PlacesUtils.endl;
addData(content.type, content.entries.join(glue));
}
});
if (hasData) {
Services.clipboard.setData(
xferable,
null,
Ci.nsIClipboard.kGlobalClipboard
);
}
},
onDragStartManaged(event) {

59
browser/base/content/browser.js
Просмотреть файл

@ -2098,11 +2098,9 @@ var gBrowserInit = {
child => !("toplevel_name" in child)
);
if (children.length) {
let managedBookmarksButton = document.createXULElement(
"toolbarbutton"
let managedBookmarksButton = document.getElementById(
"managed-bookmarks"
);
managedBookmarksButton.setAttribute("id", "managed-bookmarks");
managedBookmarksButton.setAttribute("class", "bookmark-item");
let toplevel = managedBookmarks.find(
element => "toplevel_name" in element
);
@ -2111,58 +2109,9 @@ var gBrowserInit = {
"label",
toplevel.toplevel_name
);
} else {
managedBookmarksButton.setAttribute(
"data-l10n-id",
"managed-bookmarks"
);
}
managedBookmarksButton.setAttribute("context", "placesContext");
managedBookmarksButton.setAttribute("container", "true");
managedBookmarksButton.setAttribute("removable", "false");
managedBookmarksButton.setAttribute("type", "menu");
let managedBookmarksPopup = document.createXULElement("menupopup");
managedBookmarksPopup.setAttribute("id", "managed-bookmarks-popup");
managedBookmarksPopup.setAttribute(
"oncommand",
"PlacesToolbarHelper.openManagedBookmark(event);"
);
managedBookmarksPopup.setAttribute(
"onclick",
"checkForMiddleClick(this, event);"
);
managedBookmarksPopup.setAttribute(
"ondragover",
"event.dataTransfer.effectAllowed='none';"
);
managedBookmarksPopup.setAttribute(
"ondragstart",
"PlacesToolbarHelper.onDragStartManaged(event);"
);
managedBookmarksPopup.setAttribute(
"onpopupshowing",
"PlacesToolbarHelper.populateManagedBookmarks(this);"
);
managedBookmarksPopup.setAttribute("placespopup", "true");
managedBookmarksPopup.setAttribute("is", "places-popup");
managedBookmarksButton.appendChild(managedBookmarksPopup);
gNavToolbox.palette.appendChild(managedBookmarksButton);
CustomizableUI.ensureWidgetPlacedInWindow(
"managed-bookmarks",
window
);
// Add button if it doesn't exist
if (!CustomizableUI.getPlacementOfWidget("managed-bookmarks")) {
CustomizableUI.addWidgetToArea(
"managed-bookmarks",
CustomizableUI.AREA_BOOKMARKS,
0
);
managedBookmarksButton.removeAttribute("data-l10n-id");
}
managedBookmarksButton.hidden = false;
}
}
}

16
browser/base/content/browser.xhtml
Просмотреть файл

@ -2043,6 +2043,22 @@
customizable="true">
<toolbartabstop skipintoolbarset="true"/>
<toolbarbutton id="managed-bookmarks"
class="bookmark-item"
data-l10n-id="managed-bookmarks"
context="placesContextManaged"
container="true"
removable="false"
hidden="true"
type="menu">
<menupopup id="managed-bookmarks-popup"
oncommand="PlacesToolbarHelper.openManagedBookmark(event);"
onclick="checkForMiddleClick(this, event);"
ondragover="event.dataTransfer.effectAllowed='none';"
ondragstart="PlacesToolbarHelper.onDragStartManaged(event);"
onpopupshowing="PlacesToolbarHelper.populateManagedBookmarks(this);"/>
</toolbarbutton>
<toolbaritem id="personal-bookmarks"
title="&bookmarksToolbarItem.label;"
cui-areatype="toolbar"

2
browser/components/customizableui/CustomizableUI.jsm
Просмотреть файл

@ -276,7 +276,7 @@ var CustomizableUIInternal = {
CustomizableUI.AREA_BOOKMARKS,
{
type: CustomizableUI.TYPE_TOOLBAR,
defaultPlacements: ["personal-bookmarks"],
defaultPlacements: ["managed-bookmarks", "personal-bookmarks"],
defaultCollapsed: true,
},
true

10
browser/components/enterprisepolicies/tests/browser/managedbookmarks/browser_policy_managedbookmarks.js
Просмотреть файл

@ -117,7 +117,7 @@ add_task(async function test_open_managedbookmark() {
managedBookmarksMenu.open = true;
await promise;
let context = document.getElementById("placesContext");
let context = document.getElementById("placesContextManaged");
let openContextMenuPromise = BrowserTestUtils.waitForEvent(
context,
"popupshown"
@ -134,7 +134,9 @@ add_task(async function test_open_managedbookmark() {
let tabCreatedPromise = BrowserTestUtils.waitForNewTab(gBrowser, null, true);
let openInNewTabOption = document.getElementById("placesContext_open:newtab");
let openInNewTabOption = document.getElementById(
"placesContextManaged_open:newtab"
);
EventUtils.synthesizeMouseAtCenter(openInNewTabOption, {
button: 0,
});
@ -162,7 +164,7 @@ add_task(async function test_copy_managedbookmark() {
managedBookmarksMenu.open = true;
await promise;
let context = document.getElementById("placesContext");
let context = document.getElementById("placesContextManaged");
let openContextMenuPromise = BrowserTestUtils.waitForEvent(
context,
"popupshown"
@ -177,7 +179,7 @@ add_task(async function test_copy_managedbookmark() {
await openContextMenuPromise;
info("Opened context menu");
let copyOption = document.getElementById("placesContext_copy");
let copyOption = document.getElementById("placesContextManaged_copy");
await new Promise((resolve, reject) => {
SimpleTest.waitForClipboard(

194
browser/components/places/PlacesUIUtils.jsm
Просмотреть файл

@ -454,10 +454,6 @@ var PlacesUIUtils = {
return null;
}
if (popupNode) {
let isManaged = !!popupNode.closest("#managed-bookmarks");
if (isManaged) {
return this.managedBookmarksController;
}
let view = this.getViewForNode(popupNode);
if (view && view._contextMenuShown) {
return view.controllers.getControllerForCommand(command);
@ -1217,196 +1213,6 @@ var PlacesUIUtils = {
this.maybeToggleBookmarkToolbarVisibility(true);
}
},
async managedPlacesContextShowing(event) {
let menupopup = event.target;
let document = menupopup.ownerDocument;
let window = menupopup.ownerGlobal;
// We need to populate the submenus in order to have information
// to show the context menu.
if (
menupopup.triggerNode.id == "managed-bookmarks" &&
!menupopup.triggerNode.menupopup.hasAttribute("hasbeenopened")
) {
await window.PlacesToolbarHelper.populateManagedBookmarks(
menupopup.triggerNode.menupopup
);
}
let linkItems = [
"placesContext_open:newtab",
"placesContext_open:newwindow",
"placesContext_open:newprivatewindow",
"placesContext_openSeparator",
"placesContext_copy",
];
Array.from(menupopup.children).forEach(function(child) {
if (!(child.id in linkItems)) {
child.hidden = true;
}
});
// Store triggerNode in controller for checking if commands are enabled
this.managedBookmarksController.triggerNode = menupopup.triggerNode;
// Container in this context means a folder.
let isFolder = menupopup.triggerNode.hasAttribute("container");
let openContainerInTabs_menuitem = document.getElementById(
"placesContext_openContainer:tabs"
);
if (isFolder) {
// Disable the openContainerInTabs menuitem if there
// are no children of the menu that have links.
let menuitems = menupopup.triggerNode.menupopup.children;
let openContainerInTabs = Array.from(menuitems).some(
menuitem => menuitem.link
);
openContainerInTabs_menuitem.disabled = !openContainerInTabs;
} else {
document.getElementById(
"placesContext_open:newprivatewindow"
).hidden = PrivateBrowsingUtils.isWindowPrivate(window);
}
openContainerInTabs_menuitem.hidden = !isFolder;
linkItems.forEach(id => (document.getElementById(id).hidden = isFolder));
event.target.ownerGlobal.updateCommands("places");
},
placesContextShowing(event) {
let menupopup = event.target;
let isManaged = !!menupopup.triggerNode.closest("#managed-bookmarks");
if (isManaged) {
this.managedPlacesContextShowing(event);
return true;
}
let document = menupopup.ownerDocument;
menupopup._view = this.getViewForNode(document.popupNode);
if (!this.openInTabClosesMenu) {
document
.getElementById("placesContext_open:newtab")
.setAttribute("closemenu", "single");
}
return menupopup._view.buildContextMenu(menupopup);
},
placesContextHiding(event) {
let menupopup = event.target;
if (menupopup._view) {
menupopup._view.destroyContextMenu();
}
},
openSelectionInTabs(event) {
let isManaged = !!event.target.parentNode.triggerNode.closest(
"#managed-bookmarks"
);
let controller;
if (isManaged) {
controller = this.managedBookmarksController;
} else {
let document = event.target.ownerDocument;
controller = PlacesUIUtils.getViewForNode(document.popupNode).controller;
}
controller.openSelectionInTabs(event);
},
managedBookmarksController: {
triggerNode: null,
openSelectionInTabs(event) {
let window = event.target.ownerGlobal;
let menuitems = event.target.parentNode.triggerNode.menupopup.children;
let items = [];
for (let i = 0; i < menuitems.length; i++) {
if (menuitems[i].link) {
let item = {};
item.uri = menuitems[i].link;
item.isBookmark = true;
items.push(item);
}
}
PlacesUIUtils.openTabset(items, event, window);
},
isCommandEnabled(command) {
switch (command) {
case "placesCmd_copy":
case "placesCmd_open:window":
case "placesCmd_open:privatewindow":
case "placesCmd_open:tab": {
return true;
}
}
return false;
},
doCommand(command) {
let window = this.triggerNode.ownerGlobal;
switch (command) {
case "placesCmd_copy":
// This is a little hacky, but there is a lot of code in Places that handles
// clipboard stuff, so it's easier to reuse.
let node = {};
node.type = 0;
node.title = this.triggerNode.label;
node.uri = this.triggerNode.link;
// Copied from _populateClipboard in controller.js
// This order is _important_! It controls how this and other applications
// select data to be inserted based on type.
let contents = [
{ type: PlacesUtils.TYPE_X_MOZ_URL, entries: [] },
{ type: PlacesUtils.TYPE_HTML, entries: [] },
{ type: PlacesUtils.TYPE_UNICODE, entries: [] },
];
contents.forEach(function(content) {
content.entries.push(PlacesUtils.wrapNode(node, content.type));
});
let xferable = Cc[
"@mozilla.org/widget/transferable;1"
].createInstance(Ci.nsITransferable);
xferable.init(null);
function addData(type, data) {
xferable.addDataFlavor(type);
xferable.setTransferData(
type,
PlacesUtils.toISupportsString(data),
data.length * 2
);
}
contents.forEach(function(content) {
addData(content.type, content.entries.join(PlacesUtils.endl));
});
Services.clipboard.setData(
xferable,
null,
Ci.nsIClipboard.kGlobalClipboard
);
break;
case "placesCmd_open:privatewindow":
window.openUILinkIn(this.triggerNode.link, "window", {
triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
private: true,
});
break;
case "placesCmd_open:window":
window.openUILinkIn(this.triggerNode.link, "window", {
triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
private: false,
});
break;
case "placesCmd_open:tab": {
window.openUILinkIn(this.triggerNode.link, "tab", {
triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
});
}
}
},
},
};
// These are lazy getters to avoid importing PlacesUtils immediately.

37
browser/components/places/content/placesContextMenu.inc.xhtml
Просмотреть файл

@ -3,8 +3,13 @@
# You can obtain one at http://mozilla.org/MPL/2.0/.
<menupopup id="placesContext"
onpopupshowing="return PlacesUIUtils.placesContextShowing(event);"
onpopuphiding="PlacesUIUtils.placesContextHiding(event);">
onpopupshowing="this._view = PlacesUIUtils.getViewForNode(document.popupNode);
if (!PlacesUIUtils.openInTabClosesMenu) {
document.getElementById('placesContext_open:newtab')
.setAttribute('closemenu', 'single');
}
return this._view.buildContextMenu(this);"
onpopuphiding="this._view.destroyContextMenu();">
<menuitem id="placesContext_open"
command="placesCmd_open"
data-l10n-id="places-open"
@ -18,13 +23,15 @@
selectiontype="single"
selection="link"/>
<menuitem id="placesContext_openContainer:tabs"
oncommand="PlacesUIUtils.openSelectionInTabs(event);"
oncommand="var view = PlacesUIUtils.getViewForNode(document.popupNode);
view.controller.openSelectionInTabs(event);"
onclick="checkForMiddleClick(this, event);"
data-l10n-id="places-open-all-in-tabs"
selectiontype="single|none"
selection="folder|host|query"/>
<menuitem id="placesContext_openLinks:tabs"
oncommand="PlacesUIUtils.openSelectionInTabs(event);"
oncommand="var view = PlacesUIUtils.getViewForNode(document.popupNode);
view.controller.openSelectionInTabs(event);"
onclick="checkForMiddleClick(this, event);"
data-l10n-id="places-open-all-in-tabs"
selectiontype="multiple"
@ -109,3 +116,25 @@
data-l10n-id="places-properties"
selection="bookmark|folder|query"/>
</menupopup>
<menupopup id="placesContextManaged"
onpopupshowing="PlacesToolbarHelper.updateManagedBookmarksContextMenu(this)">
<menuitem id="placesContextManaged_open:newtab"
oncommand="PlacesToolbarHelper.openManagedBookmark(event, 'tab');"
data-l10n-id="places-open-tab"/>
<menuitem id="placesContextManaged_openContainer:tabs"
oncommand="PlacesToolbarHelper.openManagedFolder(event);"
onclick="checkForMiddleClick(this, event);"
data-l10n-id="places-open-all-in-tabs"/>
<menuitem id="placesContextManaged_open:newwindow"
oncommand="PlacesToolbarHelper.openManagedBookmark(event, 'window');"
data-l10n-id="places-open-window"/>
<menuitem id="placesContextManaged_open:newprivatewindow"
oncommand="PlacesToolbarHelper.openManagedBookmark(event, 'window', true);"
data-l10n-id="places-open-private-window"
hideifprivatebrowsing="true"/>
<menuseparator id="placesContextManaged_openSeparator"/>
<menuitem id="placesContextManaged_copy"
oncommand="PlacesToolbarHelper.copyManagedBookmark(event);"
data-l10n-id="text-action-copy"/>
</menupopup>

18
browser/modules/test/browser/browser_UsageTelemetry_toolbars.js
Просмотреть файл

@ -178,6 +178,8 @@ add_task(async function widgetPositions() {
"forward-button_pinned_nav-bar-start",
"back-button_pinned_nav-bar-start",
"managed-bookmarks_pinned_bookmarks-bar",
]);
organizeToolbars({
@ -228,6 +230,8 @@ add_task(async function widgetPositions() {
"fxa-toolbar-menu-button_pinned_bookmarks-bar",
"new-tab-button_pinned_bookmarks-bar",
"developer-button_pinned_bookmarks-bar",
"managed-bookmarks_pinned_bookmarks-bar",
]);
CustomizableUI.reset();
@ -269,6 +273,8 @@ add_task(async function customizeMode() {
"library-button_pinned_nav-bar-end",
"personal-bookmarks_pinned_bookmarks-bar",
"managed-bookmarks_pinned_bookmarks-bar",
]);
let win = await BrowserTestUtils.openNewBrowserWindow();
@ -359,6 +365,8 @@ add_task(async function contextMenus() {
"library-button_pinned_nav-bar-end",
"personal-bookmarks_pinned_bookmarks-bar",
"managed-bookmarks_pinned_bookmarks-bar",
]);
let menu = document.getElementById("toolbar-context-menu");
@ -442,6 +450,8 @@ add_task(async function pageActions() {
"pinTab_pinned_pageaction-urlbar",
"personal-bookmarks_pinned_bookmarks-bar",
"managed-bookmarks_pinned_bookmarks-bar",
]);
let panel = document.getElementById("pageActionPanel");
@ -544,6 +554,8 @@ add_task(async function extensions() {
"random-addon-example-com_pinned_nav-bar-end",
"random-addon-example-com_pinned_pageaction-urlbar",
"managed-bookmarks_pinned_bookmarks-bar",
]);
let addon = await AddonManager.getAddonByID(extension.id);
@ -567,6 +579,8 @@ add_task(async function extensions() {
"forward-button_pinned_nav-bar-start",
"back-button_pinned_nav-bar-start",
"managed-bookmarks_pinned_bookmarks-bar",
]);
await addon.enable();
@ -593,6 +607,8 @@ add_task(async function extensions() {
"random-addon-example-com_pinned_nav-bar-end",
"random-addon-example-com_pinned_pageaction-urlbar",
"managed-bookmarks_pinned_bookmarks-bar",
]);
await addon.reload();
@ -637,6 +653,8 @@ add_task(async function extensions() {
"forward-button_pinned_nav-bar-start",
"back-button_pinned_nav-bar-start",
"managed-bookmarks_pinned_bookmarks-bar",
]);
});
});