gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-24 12:55:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix strictfocus edgecase when the content window is editable.

Browse Source 
--HG--
extra : transplant_source : B4%F6%E1a%0A%0Eo8u%DC%A0%E8%27%01%E1%8A%FF3Z
This commit is contained in:
Kris Maglione
2011-01-26 19:53:46 -05:00
parent 8db7f4c1e5
commit 197850aeca
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
common/content/events.js
View File

@@ -960,32 +960,31 @@ var Events = Module("events", {
// the main window does not restore focus and we lose key
// input.
services.focus.clearFocus(window);
document.commandDispatcher.focusedWindow = content;
document.commandDispatcher.focusedWindow = Editor.getEditor(content) ? window : content;
}
},
// TODO: Merge with onFocusChange
focus: function onFocus(event) {
let elem = event.originalTarget;
if (elem instanceof Element) {
let win = elem.ownerDocument.defaultView;
if (event.target instanceof Ci.nsIDOMXULTextBoxElement)
for (let e = elem; e instanceof Element; e = e.parentNode)
if (util.computedStyle(e).visibility !== "visible" ||
e.boxObject && e.boxObject.height === 0) {
elem.blur();
break;
}
if (events.isContentNode(elem) && !buffer.focusAllowed(elem)
&& !(services.focus.getLastFocusMethod(win) & 0x7000)
&& isinstance(elem, [HTMLInputElement, HTMLSelectElement, HTMLTextAreaElement, Window])) {
if (elem.frameElement)
dactyl.focusContent(true);
else if (!(elem instanceof Window) || Editor.getEditor(elem))
if (event.target instanceof Ci.nsIDOMXULTextBoxElement)
for (let e = elem; e instanceof Element; e = e.parentNode)
if (util.computedStyle(e).visibility !== "visible" ||
e.boxObject && e.boxObject.height === 0) {
elem.blur();
}
break;
}
let win = (elem.ownerDocument || elem).defaultView || elem;
if (events.isContentNode(elem) && !buffer.focusAllowed(elem)
&& !(services.focus.getLastFocusMethod(win) & 0x7000)
&& isinstance(elem, [HTMLInputElement, HTMLSelectElement, HTMLTextAreaElement, Window])) {
if (elem.frameElement)
dactyl.focusContent(true);
else if (!(elem instanceof Window) || Editor.getEditor(elem))
dactyl.focus(window);
}
},