gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-21 20:15:46 +01:00
Code Issues Projects Releases Wiki Activity

Remove some config.name checks. Add configbase module.

Browse Source
This commit is contained in:
Kris Maglione
2009-05-23 21:08:50 -04:00
parent 16b8af74d1
commit b8aab050e9
8 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/content/events.js
View File

@@ -1014,10 +1014,8 @@ function Events() //{{{
if (this.duringFeed != "")
{
//Create a scalar constant for closure.
let duringFeed = this.duringFeed;
this.duringFeed = "";
setTimeout(function () events.feedkeys(duringFeed, false, false, true), 0);
}
}
@@ -1458,13 +1456,8 @@ function Events() //{{{
// XXX: ugly hack for now pass certain keys to Firefox as they are without beeping
// also fixes key navigation in combo boxes, submitting forms, etc.
// FIXME: breaks iabbr for now --mst
if (((config.name == "Xulmus" || config.name == "Vimperator") && liberator.mode == modes.NORMAL || liberator.mode == modes.INSERT))
{
if (key == "<Return>")
return false;
else if (key == "<Space>" || key == "<Up>" || key == "<Down>")
return false;
}
if (key in config.ignoreKeys && (config.ignoreKeys[key] & liberator.mode))
return false;
// TODO: handle middle click in content area
@@ -1601,8 +1594,8 @@ function Events() //{{{
else // if the key is neither a mapping nor the start of one
{
// the mode checking is necessary so that things like g<esc> do not beep
if (input.buffer != "" && !skipMap && (liberator.mode == modes.INSERT ||
liberator.mode == modes.COMMAND_LINE || liberator.mode == modes.TEXTAREA))
if (input.buffer != "" && !skipMap &&
(liberator.mode & (modes.INSERT | modes.COMMAND_LINE | modes.TEXTAREA)))
{
// no map found -> refeed stuff in input.buffer (only while in INSERT, CO... modes)
skipMap = true; // ignore maps while doing so