gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-22 10:05:49 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup Pass Through bit rot.

Browse Source 
--HG--
extra : rebase_source : 66ce280799e5bffd9e9b0729b772c3b6639eeb86
This commit is contained in:
Kris Maglione
2011-07-01 11:19:10 -04:00
parent 20cc063b68
commit 130721879d
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/content/events.js
View File

@@ -1333,20 +1333,19 @@ var Events = Module("events", {
let ignore = false; let ignore = false;
if (modes.main == modes.PASS_THROUGH) if (mode.main == modes.PASS_THROUGH)
ignore = !Events.isEscape(key) && key != "<C-v>"; ignore = !Events.isEscape(key) && key != "<C-v>";
else if (modes.main == modes.QUOTE) { else if (mode.main == modes.QUOTE) {
if (modes.getStack(1).main == modes.PASS_THROUGH) { if (modes.getStack(1).main == modes.PASS_THROUGH) {
mode.params.mainMode = modes.getStack(2).main; mode = Modes.StackElement(modes.getStack(2).main);
ignore = Events.isEscape(key); ignore = Events.isEscape(key);
} }
else if (events.shouldPass(event)) else if (events.shouldPass(event))
mode.params.mainMode = modes.getStack(1).main; mode = Modes.StackElement(modes.getStack(1).main);
else else
ignore = true; ignore = true;
if (ignore) modes.pop();
modes.pop();
} }
else if (!event.isMacro && !event.noremap && events.shouldPass(event)) else if (!event.isMacro && !event.noremap && events.shouldPass(event))
ignore = true; ignore = true;
@@ -1652,7 +1651,7 @@ var Events = Module("events", {
["<C-z>", "<pass-all-keys>"], "Temporarily ignore all " + config.appName + " key bindings", ["<C-z>", "<pass-all-keys>"], "Temporarily ignore all " + config.appName + " key bindings",
function () { modes.push(modes.PASS_THROUGH); }); function () { modes.push(modes.PASS_THROUGH); });
mappings.add([modes.MAIN], mappings.add([modes.MAIN, modes.PASS_THROUGH, modes.QUOTE],
["<C-v>", "<pass-next-key>"], "Pass through next key", ["<C-v>", "<pass-next-key>"], "Pass through next key",
function () { function () {
if (modes.main == modes.QUOTE) if (modes.main == modes.QUOTE)