gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 05:37:58 +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

15
common/content/editor.js
View File

@@ -30,7 +30,7 @@ const Editor = Module("editor", {
return;
}
let elem = dactyl.focus;
let elem = dactyl.focusedElement;
if (elem.setSelectionRange) {
let text = dactyl.clipboardRead(clipboard);
@@ -254,7 +254,7 @@ const Editor = Module("editor", {
if (!options["editor"])
return;
let textBox = config.isComposeWindow ? null : dactyl.focus;
let textBox = config.isComposeWindow ? null : dactyl.focusedElement;
let line, column;
if (!forceEditing && textBox && textBox.type == "password") {
@@ -373,12 +373,12 @@ const Editor = Module("editor", {
}, {
getEditor: function (elem) {
if (arguments.length === 0) {
dactyl.assert(dactyl.focus);
return dactyl.focus;
dactyl.assert(dactyl.focusedElement);
return dactyl.focusedElement;
}
if (!elem)
elem = dactyl.focus || document.commandDispatcher.focusedWindow;
elem = dactyl.focusedElement || document.commandDispatcher.focusedWindow;
dactyl.assert(elem);
if (elem instanceof Element)
@@ -394,7 +394,7 @@ const Editor = Module("editor", {
},
getController: function () {
let ed = dactyl.focus;
let ed = dactyl.focusedElement;
if (!ed || !ed.controllers)
return null;
@@ -597,7 +597,8 @@ const Editor = Module("editor", {
["<Tab>"], "Expand insert mode abbreviation",
function () {
editor.expandAbbreviation(modes.INSERT);
document.commandDispatcher.advanceFocus();
services.focus.moveFocus(window, null, Ci.nsIFocusManager.MOVEFOCUS_FORWARD,
Ci.nsIFocusManager.FLAG_BYKEY);
});
mappings.add([modes.INSERT],