gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-21 14:57:59 +01:00
Code Issues Projects Releases Wiki Activity

:emenu invocation efficiency enhancement.

Browse Source
This commit is contained in:
Kris Maglione
2011-09-26 23:10:59 -04:00
parent 775612f66d
commit 0f9cb3100b
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
common/content/dactyl.js
View File

@@ -135,31 +135,27 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
set: function mode(val) modes.main = val set: function mode(val) modes.main = val
}), }),
get menuItems() { getMenuItems: function getMenuItems(targetPath) {
function dispatch(node, name) {
let event = node.ownerDocument.createEvent("Events");
event.initEvent(name, false, false);
node.dispatchEvent(event);
}
function addChildren(node, parent) { function addChildren(node, parent) {
DOM(node).createContents(); DOM(node).createContents();
if (~["menu", "menupopup"].indexOf(node.localName) && node.children.length) if (~["menu", "menupopup"].indexOf(node.localName) && node.children.length)
dispatch(node, "popupshowing"); DOM(node).popupshowing({ bubbles: false });
for (let [, item] in Iterator(node.childNodes)) { for (let [, item] in Iterator(node.childNodes)) {
if (item.childNodes.length == 0 && item.localName == "menuitem" if (item.childNodes.length == 0 && item.localName == "menuitem"
&& !item.hidden && !item.hidden
&& !/rdf:http:/.test(item.getAttribute("label"))) { // FIXME && !/rdf:http:/.test(item.getAttribute("label"))) { // FIXME
item.dactylPath = parent + item.getAttribute("label"); item.dactylPath = parent + item.getAttribute("label");
items.push(item); if (!targetPath || targetPath.indexOf(item.dactylPath) == 0)
items.push(item);
} }
else { else {
let path = parent; let path = parent;
if (item.localName == "menu") if (item.localName == "menu")
path += item.getAttribute("label") + "."; path += item.getAttribute("label") + ".";
addChildren(item, path); if (!targetPath || targetPath.indexOf(path) == 0)
addChildren(item, path);
} }
} }
} }
@@ -169,6 +165,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
return items; return items;
}, },
get menuItems() this.getMenuItems(),
// Global constants // Global constants
CURRENT_TAB: "here", CURRENT_TAB: "here",
NEW_TAB: "tab", NEW_TAB: "tab",
@@ -1510,7 +1508,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
"Execute the specified menu item from the command line", "Execute the specified menu item from the command line",
function (args) { function (args) {
let arg = args[0] || ""; let arg = args[0] || "";
let items = dactyl.menuItems; let items = dactyl.getMenuItems(arg);
dactyl.assert(items.some(function (i) i.dactylPath == arg), dactyl.assert(items.some(function (i) i.dactylPath == arg),
_("emenu.notFound", arg)); _("emenu.notFound", arg));