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

<return> support for hints

Browse Source
This commit is contained in:
Martin Stubenschrott
2007-10-24 21:20:10 +00:00
parent 701496cd0a
commit d9856b3f06
2 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
content/hints.js
View File

@@ -336,24 +336,58 @@ outer:
this.onEvent = function(event)
{
var num = String.fromCharCode(event.charCode).toLowerCase();
linkNumString += "" + num;
//setTimeout( function() { canUpdate = true; }, timeout);
var key = vimperator.events.toString(event);
var endAfterThisKey = false;
switch (key)
{
case "<Return>":
endAfterThisKey = true;
//if (valid_hints.length == 0)
//{
// vimperator.beep();
// vimperator.modes.reset();
// return;
//}
//else
// valid_hints = [valid_hints[0]];
break;
case "<Space>":
linkNumString += " ";
break;
case "<BS>":
if (linkNumString = "")
{
vimperator.beep();
return;
}
else
linkNumString = linkNumString.substr(0, linkNumString.length-1);
break;
default:
linkNumString += key;
}
vimperator.statusline.updateInputBuffer(linkNumString);
showHints(null, linkNumString);
if (valid_hints.length == 0)
vimperator.beep();
else if (valid_hints.length >= 1)
else
{
var first_href = valid_hints[0].getAttribute("href") || null;
if (first_href)
if (!endAfterThisKey)
{
if (valid_hints.some( function(e) { return e.getAttribute("href") != first_href; } ))
var first_href = valid_hints[0].getAttribute("href") || null;
if (first_href)
{
if (valid_hints.some( function(e) { return e.getAttribute("href") != first_href; } ))
return;
}
else if (valid_hints.length > 1)
return;
}
else if (valid_hints.length > 1)
return;
vimperator.echo(" ");
vimperator.statusline.updateInputBuffer("");
@@ -388,7 +422,7 @@ outer:
setTimeout( function() {
if (vimperator.mode == vimperator.modes.HINTS)
vimperator.modes.reset(true);
}, 500);
}, endAfterThisKey ? 0 : 500);
}
}

4
content/modes.js
View File

@@ -112,8 +112,8 @@ vimperator.modes = (function()
vimperator.options.setFirefoxPref("accessibility.browsewithcaret", false);
vimperator.statusline.updateUrl();
// XXX: auto-focusing of content disabled, as it breaks hints partly
//vimperator.focusContent();
// XXX: auto-focusing breaks hints partly, find a good solution
vimperator.focusContent();
}
}