rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Excluded userContextId in context menu

Browse source
This commit is contained in:
baku 2017-01-23 11:26:35 +01:00
parent b97ac94318
commit 0527893ead
1 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
index.js
View file

@ -693,22 +693,29 @@ ContainerWindow.prototype = {
}, },
_configureFileMenu() { _configureFileMenu() {
return this._configureMenu("menu_newUserContext", e => { return this._configureMenu("menu_newUserContext", null, e => {
const userContextId = parseInt(e.target.getAttribute("data-usercontextid"), 10); const userContextId = parseInt(e.target.getAttribute("data-usercontextid"), 10);
ContainerService.openTab({ userContextId }); ContainerService.openTab({ userContextId });
}); });
}, },
_configureContextMenu() { _configureContextMenu() {
return this._configureMenu("context-openlinkinusercontext-menu", e => { return this._configureMenu("context-openlinkinusercontext-menu",
// This is a super internal method. Hopefully it will be stable in the () => {
// next FF releases. // This userContextId is what we want to exclude.
this._window.gContextMenu.openLinkInTab(e); const tab = modelFor(this._window).tabs.activeTab;
}); return ContainerService._getUserContextIdFromTab(tab);
},
e => {
// This is a super internal method. Hopefully it will be stable in the
// next FF releases.
this._window.gContextMenu.openLinkInTab(e);
}
);
}, },
// Generic menu configuration. // Generic menu configuration.
_configureMenu(menuId, cb) { _configureMenu(menuId, excludedContainerCb, clickCb) {
const menu = this._window.document.getElementById(menuId); const menu = this._window.document.getElementById(menuId);
// containerAddonMagic attribute is a custom attribute we set in order to // containerAddonMagic attribute is a custom attribute we set in order to
// know if this menu has been already converted. // know if this menu has been already converted.
@ -726,15 +733,15 @@ ContainerWindow.prototype = {
const menupopup = this._window.document.createElementNS(XUL_NS, "menupopup"); const menupopup = this._window.document.createElementNS(XUL_NS, "menupopup");
menu.appendChild(menupopup); menu.appendChild(menupopup);
menupopup.addEventListener("command", cb); menupopup.addEventListener("command", clickCb);
menupopup.addEventListener("popupshowing", e => { menupopup.addEventListener("popupshowing", e => {
return this._createMenu(e); return this._createMenu(e, excludedContainerCb);
}); });
return Promise.resolve(null); return Promise.resolve(null);
}, },
_createMenu(event) { _createMenu(event, excludedContainerCb) {
while (event.target.hasChildNodes()) { while (event.target.hasChildNodes()) {
event.target.removeChild(event.target.firstChild); event.target.removeChild(event.target.firstChild);
} }
@ -742,7 +749,26 @@ ContainerWindow.prototype = {
ContainerService.queryIdentities().then(identities => { ContainerService.queryIdentities().then(identities => {
const fragment = this._window.document.createDocumentFragment(); const fragment = this._window.document.createDocumentFragment();
const excludedUserContextId = excludedContainerCb ? excludedContainerCb() : 0;
if (excludedUserContextId) {
const bundle = this._window.document.getElementById("bundle_browser");
const menuitem = this._window.document.createElementNS(XUL_NS, "menuitem");
menuitem.setAttribute("data-usercontextid", "0");
menuitem.setAttribute("label", bundle.getString("userContextNone.label"));
menuitem.setAttribute("accesskey", bundle.getString("userContextNone.accesskey"));
fragment.appendChild(menuitem);
const menuseparator = this._window.document.createElementNS(XUL_NS, "menuseparator");
fragment.appendChild(menuseparator);
}
identities.forEach(identity => { identities.forEach(identity => {
if (identity.userContextId === excludedUserContextId) {
return;
}
const menuitem = this._window.document.createElementNS(XUL_NS, "menuitem"); const menuitem = this._window.document.createElementNS(XUL_NS, "menuitem");
menuitem.setAttribute("label", identity.name); menuitem.setAttribute("label", identity.name);
menuitem.classList.add("menuitem-iconic"); menuitem.classList.add("menuitem-iconic");