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

Minor key event processing changes.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-16 23:01:54 -05:00
parent d76a6e7f0f
commit aa89cabb79
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/content/events.js
View File

@@ -57,7 +57,7 @@ var ProcessorStack = Class("ProcessorStack", {
res = dactyl.trapErrors(res); res = dactyl.trapErrors(res);
events.dbg("ACTION RES: " + res); events.dbg("ACTION RES: " + res);
} }
result = res === Events.PASS ? Events.PASS : Events.KILL; result = res !== undefined ? res : Events.KILL;
if (res !== Events.PASS) if (res !== Events.PASS)
this.processors.length = 0; this.processors.length = 0;
} }
@@ -77,11 +77,12 @@ var ProcessorStack = Class("ProcessorStack", {
else if (result === undefined) else if (result === undefined)
result = Events.PASS; result = Events.PASS;
events.dbg("RESULT: " + (result === Events.KILL ? "KILL" : events.dbg("RESULT: " + (result === Events.KILL ? "KILL" :
result === Events.PASS ? "PASS" : result === Events.PASS ? "PASS" :
result === Events.ABORT ? "ABORT" : result)); result === Events.PASS_THROUGH ? "PASS_THROUGH" :
result === Events.ABORT ? "ABORT" : result));
if (result !== Events.PASS) if (result !== Events.PASS || this.events.length > 1)
Events.kill(this.events[this.events.length - 1]); Events.kill(this.events[this.events.length - 1]);
if (result === Events.PASS_THROUGH) if (result === Events.PASS_THROUGH)
@@ -216,7 +217,7 @@ var KeyProcessor = Class("KeyProcessor", {
else if (map.motion) else if (map.motion)
return KeyArgProcessor(this, map, true, "motion"); return KeyArgProcessor(this, map, true, "motion");
return this.execute(map, { count: this.count, command: this.command, events: this.events }); return this.execute(map, { count: this.count, command: this.command, events: this.events, allEvents: this.allEvents });
} }
if (!this.waiting) if (!this.waiting)