gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-04 18:34:11 +01:00
Code Issues Projects Releases Wiki Activity

Fix <A-Tab>

Browse Source
This commit is contained in:
Kris Maglione
2011-10-04 03:05:39 -04:00
parent 0c1fc4f421
commit 3693c79f13
4 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/modules/buffer.jsm
View File

@@ -289,8 +289,6 @@ var Buffer = Module("Buffer", {
* @param {Node} elem The element to focus.
*/
focusElement: function focusElement(elem) {
let { Editor, dactyl } = this.modules;
let win = elem.ownerDocument && elem.ownerDocument.defaultView || elem;
overlay.setData(elem, "focus-allowed", true);
overlay.setData(win.document, "focus-allowed", true);
@@ -313,15 +311,17 @@ var Buffer = Module("Buffer", {
else
flags = services.focus.FLAG_SHOWRING;
// Hack to deal with current versions of Firefox misplacing
// the caret
if (!overlay.getData(elem, "had-focus", false) &&
elem.value &&
elem instanceof Ci.nsIDOMHTMLInputElement &&
Editor.getEditor(elem) &&
DOM(elem).isEditable &&
elem.selectionStart != null &&
elem.selectionStart == elem.selectionEnd)
elem.selectionStart = elem.selectionEnd = elem.value.length;
dactyl.focus(elem, flags);
DOM(elem).focus(flags);
if (elem instanceof Ci.nsIDOMWindow) {
let sel = elem.getSelection();
@@ -813,8 +813,6 @@ var Buffer = Module("Buffer", {
* count skips backwards.
*/
shiftFrameFocus: function shiftFrameFocus(count) {
let { dactyl } = this.modules;
if (!(this.doc instanceof Ci.nsIDOMHTMLDocument))
return;
@@ -835,20 +833,21 @@ var Buffer = Module("Buffer", {
// calculate the next frame to focus
let next = current + count;
if (next < 0 || next >= frames.length)
util.dactyl.beep();
dactyl.beep();
next = Math.constrain(next, 0, frames.length - 1);
// focus next frame and scroll into view
dactyl.focus(frames[next]);
DOM(frames[next]).focus();
if (frames[next] != this.win)
DOM(frames[next].frameElement).scrollIntoView();
// add the frame indicator
let doc = frames[next].document;
let indicator = util.xmlToDom(<div highlight="FrameIndicator"/>, doc);
(doc.body || doc.documentElement || doc).appendChild(indicator);
let indicator = DOM(<div highlight="FrameIndicator"/>, doc)
.appendTo(doc.body || doc.documentElement || doc);
util.timeout(function () { doc.body.removeChild(indicator); }, 500);
util.timeout(function () { indicator.remove(); }, 500);
// Doesn't unattach
//doc.body.setAttributeNS(NS.uri, "activeframe", "true");