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

remove g_hint_mappings - initialise hint mappings in vimperator.mappings

Browse Source
This commit is contained in:
Doug Kearns
2007-07-03 12:46:18 +00:00
parent 0ba4a27d91
commit 8a38512346
2 changed files with 71 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
chrome/content/vimperator/vimperator.js
View File

@@ -524,7 +524,6 @@ function Events() //{{{
// if Hit-a-hint mode is on, special handling of keys is required
// g_hint_mappings is used
// FIXME: total mess
if (vimperator.hasMode(vimperator.modes.HINTS))
{
@@ -532,28 +531,26 @@ function Events() //{{{
event.preventDefault();
event.stopPropagation();
for (i = 0; i < g_hint_mappings.length; i++)
var map = vimperator.mappings.get(vimperator.modes.HINTS, key);
if (map)
{
if(g_hint_mappings[i][0] == key)
if(map.always_active || vimperator.hints.currentState() == 1)
{
if(g_hint_mappings[i][3] == true || vimperator.hints.currentState() == 1)
//g_hint_mappings[i][1].call(this, event);
map.execute();
if (map.cancel_mode) // stop processing this event
{
//g_hint_mappings[i][1].call(this, event);
eval(g_hint_mappings[i][1]);
if (g_hint_mappings[i][2] == true) // stop processing this event
{
vimperator.hints.disableHahMode();
vimperator.input.buffer = "";
vimperator.statusline.updateInputBuffer("");
return false;
}
else
{
// FIXME: make sure that YOU update the statusbar message yourself
// first in g_hint_mappings when in this mode!
vimperator.statusline.updateInputBuffer(vimperator.input.buffer);
return false;
}
vimperator.hints.disableHahMode();
vimperator.input.buffer = "";
vimperator.statusline.updateInputBuffer("");
return false;
}
else
{
// FIXME: make sure that YOU update the statusbar message yourself
// first in g_hint_mappings when in this mode!
vimperator.statusline.updateInputBuffer(vimperator.input.buffer);
return false;
}
}
}