gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-08 07:54:13 +01:00
Code Issues Projects Releases Wiki Activity

Import the bulk of a focus management patch near the top of my queue.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-18 15:27:45 -05:00
parent 0af241568b
commit 4ff7172c77
8 changed files with 81 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
common/content/dactyl.js
View File

@@ -87,9 +87,6 @@ const Dactyl = Module("dactyl", {
get menuItems() Dactyl.getMenuItems(),
/** @property {Element} The currently focused element. */
get focus() document.commandDispatcher.focusedElement,
// Global constants
CURRENT_TAB: [],
NEW_TAB: [],
@@ -385,6 +382,20 @@ const Dactyl = Module("dactyl", {
return res;
},
focus: function (elem, flags) {
try {
if (elem instanceof Document)
elem = elem.defaultView;
if (elem instanceof Window)
services.focus.clearFocus(elem);
else
services.focus.setFocus(elem, flags || Ci.nsIFocusManager.FLAG_BYMOUSE|Ci.nsIFocusManager.FLAG_BYMOVEFOCUS);
} catch (e) {
util.dump(elem);
util.reportError(e);
}
},
/**
* Focuses the content window.
*
@@ -413,21 +424,24 @@ const Dactyl = Module("dactyl", {
}
catch (e) {}
if (clearFocusedElement)
if (dactyl.focus)
dactyl.focus.blur();
else if (win && Editor.getEditor(win)) {
if (clearFocusedElement) {
services.focus.clearFocus(window);
if (win && Editor.getEditor(win)) {
win.blur();
if (win.frameElement)
win.frameElement.blur();
}
}
if (elem instanceof Window && Editor.getEditor(elem))
elem = window;
if (elem && elem != dactyl.focus)
elem.focus();
},
if (elem && elem != dactyl.focusedElement)
dactyl.focus(elem);
},
/** @property {Element} The currently focused element. */
get focusedElement() services.focus.getFocusedElementForWindow(window, true, {}),
/**
* Returns whether this Dactyl extension supports *feature*.