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

Fix strictfocus edgecase when the content window is editable.

Browse Source 
--HG--
branch : key-processing
This commit is contained in:
Kris Maglione
2011-01-26 19:53:46 -05:00
parent f4cc496dbe
commit 8c0d070d94
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/content/buffer.js
View File

@@ -551,7 +551,7 @@ var Buffer = Module("buffer", {
* @returns {boolean} * @returns {boolean}
*/ */
focusAllowed: function (elem) { focusAllowed: function (elem) {
if (elem instanceof Window && !Editor.getEditor(window)) if (elem instanceof Window && !Editor.getEditor(elem))
return true; return true;
let doc = elem.ownerDocument || elem.document || elem; let doc = elem.ownerDocument || elem.document || elem;
return !options["strictfocus"] || doc.dactylFocusAllowed; return !options["strictfocus"] || doc.dactylFocusAllowed;

1
common/content/dactyl.js
View File

@@ -482,6 +482,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
let win = document.commandDispatcher.focusedWindow; let win = document.commandDispatcher.focusedWindow;
let elem = config.mainWidget || content; let elem = config.mainWidget || content;
// TODO: make more generic // TODO: make more generic
try { try {
if (this.has("mail") && !config.isComposeWindow) { if (this.has("mail") && !config.isComposeWindow) {

9
common/content/events.js
View File

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