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

made focus handling for muttator much better

Browse Source
This commit is contained in:
Martin Stubenschrott
2008-02-10 14:34:57 +00:00
parent f9ae6d097f
commit f22a5b7ea2
1 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
content/events.js
View File

@@ -750,11 +750,14 @@ vimperator.Events = function () //{{{
if (vimperator.mode == vimperator.modes.COMMAND_LINE) if (vimperator.mode == vimperator.modes.COMMAND_LINE)
return; return;
var win = window.document.commandDispatcher.focusedWindow;
var elem = window.document.commandDispatcher.focusedElement; var elem = window.document.commandDispatcher.focusedElement;
if (elem && elem.readOnly) if (elem && elem.readOnly)
return; return;
// dump(vimperator.util.objectToString(elem) + "\n"); //dump("=+++++++++=\n" + vimperator.util.objectToString(event.target) + "\n")
//dump (elem + "\n");
//dump (win + "\n---\n");
if (elem && elem instanceof HTMLInputElement && if (elem && elem instanceof HTMLInputElement &&
(elem.type.toLowerCase() == "text" || elem.type.toLowerCase() == "password")) (elem.type.toLowerCase() == "text" || elem.type.toLowerCase() == "password"))
@@ -762,8 +765,10 @@ vimperator.Events = function () //{{{
this.wantsModeReset = false; this.wantsModeReset = false;
vimperator.mode = vimperator.modes.INSERT; vimperator.mode = vimperator.modes.INSERT;
vimperator.buffer.lastInputField = elem; vimperator.buffer.lastInputField = elem;
return;
} }
else if (elem && elem instanceof HTMLTextAreaElement)
if (elem && elem instanceof HTMLTextAreaElement)
{ {
this.wantsModeReset = false; this.wantsModeReset = false;
if (vimperator.options["insertmode"]) if (vimperator.options["insertmode"])
@@ -773,19 +778,30 @@ vimperator.Events = function () //{{{
else else
vimperator.modes.main = vimperator.modes.TEXTAREA; vimperator.modes.main = vimperator.modes.TEXTAREA;
vimperator.buffer.lastInputField = elem; vimperator.buffer.lastInputField = elem;
}
else if (vimperator.config.name == "Muttator" && (!elem || elem instanceof HTMLElement))
{
// we switch to -- MESSAGE -- mode for muttator, whenever no tree or an HTML element
// which is NOT an input element is selected
vimperator.mode = vimperator.modes.MESSAGE;
return; return;
} }
else if (vimperator.mode == vimperator.modes.INSERT || if (vimperator.config.name == "Muttator")// &&
vimperator.mode == vimperator.modes.TEXTAREA || //win && win.document && win.document instanceof HTMLDocument)
vimperator.mode == vimperator.modes.MESSAGE || {
vimperator.mode == vimperator.modes.VISUAL) // we switch to -- MESSAGE -- mode for muttator, when an HTML document
// is selected but not when we just click a link
if (win && win.document && win.document instanceof HTMLDocument && !elem)// || !(elem instanceof HTMLAnchorElement))
{
vimperator.mode = vimperator.modes.MESSAGE;
return;
}
if (elem instanceof HTMLAnchorElement && vimperator.mode != vimperator.modes.MESSAGE)
{
vimperator.focusContent();
return;
}
}
if (vimperator.mode == vimperator.modes.INSERT ||
vimperator.mode == vimperator.modes.TEXTAREA ||
vimperator.mode == vimperator.modes.MESSAGE ||
vimperator.mode == vimperator.modes.VISUAL)
{ {
// FIXME: currently this hack is disabled to make macros work // FIXME: currently this hack is disabled to make macros work
// this.wantsModeReset = true; // this.wantsModeReset = true;