gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-09 21:15:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix #247

Browse Source
This commit is contained in:
Kris Maglione
2009-04-22 13:15:56 -04:00
parent 9320c5b1be
commit 2f753b6d27
7 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/content/liberator.js
View File

@@ -217,16 +217,16 @@ const liberator = (function () //{{{
for (let [,item] in Iterator(node.childNodes))
{
if (item.childNodes.length == 0 && item.localName == "menuitem"
&& !/rdf:http:/.test(item.label)) // FIXME
&& !/rdf:http:/.test(item.getAttribute("label"))) // FIXME
{
item.fullMenuPath = parent + item.label;
item.fullMenuPath = parent + item.getAttribute("label");
items.push(item);
}
else
{
let path = parent;
if (item.localName == "menu")
path += item.label + ".";
path += item.getAttribute("label") + ".";
addChildren(item, path);
}
}
@@ -600,6 +600,8 @@ const liberator = (function () //{{{
get menuItems() getMenuItems(),
get focus() document.commandDispatcher.focusedElement,
// Global constants
CURRENT_TAB: 1,
NEW_TAB: 2,
@@ -926,9 +928,9 @@ const liberator = (function () //{{{
}
}
catch (e) {}
if (clearFocusedElement && document.commandDispatcher.focusedElement)
document.commandDispatcher.focusedElement.blur();
if (elem && (elem != document.commandDispatcher.focusedElement))
if (clearFocusedElement && liberator.focus)
liberator.focus.blur();
if (elem && elem != liberator.focus)
elem.focus();
},