Skip to content
This repository has been archived by the owner on Sep 21, 2021. It is now read-only.

Use createXULElement to create popup items #1151

Closed
wants to merge 1 commit into from
Closed

Use createXULElement to create popup items #1151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/devtools-modules/src/menu/index.js
View file
Open in desktop
Expand Up @@ -157,7 +157,7 @@ Menu.prototype.popup = function (screenX, screenY, doc) {
};

Menu.prototype.createPopup = function(doc) {
return doc.createElement("menupopup");
return doc.createXULElement("menupopup");
}

Menu.prototype._createMenuItems = function(parent) {
Expand All @@ -168,16 +168,16 @@ Menu.prototype._createMenuItems = function(parent) {
}

if (item.submenu) {
let menupopup = doc.createElement("menupopup");
let menupopup = doc.createXULElement("menupopup");
item.submenu._createMenuItems(menupopup);

let menuitem = doc.createElement("menuitem");
let menuitem = doc.createXULElement("menuitem");
menuitem.setAttribute("label", item.label);
if (!inToolbox()) {
menuitem.textContent = item.label;
}

let menu = doc.createElement("menu");
let menu = doc.createXULElement("menu");
menu.appendChild(menuitem);
menu.appendChild(menupopup);
if (item.disabled) {
Expand All @@ -194,10 +194,10 @@ Menu.prototype._createMenuItems = function(parent) {
}
parent.appendChild(menu);
} else if (item.type === "separator") {
let menusep = doc.createElement("menuseparator");
let menusep = doc.createXULElement("menuseparator");
parent.appendChild(menusep);
} else {
let menuitem = doc.createElement("menuitem");
let menuitem = doc.createXULElement("menuitem");
menuitem.setAttribute("label", item.label);

if (!inToolbox()) {
Expand Down