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

Improve the efficiency/bugginess of abbrev mappings.

Browse Source
This commit is contained in:
Kris Maglione
2015-12-20 20:35:23 -08:00
parent 174f4ec636
commit 28fe4afc4e
3 changed files with 62 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
common/content/events.js
View File

@@ -784,21 +784,43 @@ var Events = Module("events", {
let key = DOM.Event.stringify(event);
let pass = this.passing && !event.isMacro ||
DOM.Event.feedingEvent && DOM.Event.feedingEvent.isReplay ||
event.isReplay ||
modes.main == modes.PASS_THROUGH ||
modes.main == modes.QUOTE
&& modes.getStack(1).main !== modes.PASS_THROUGH
&& !this.shouldPass(event) ||
!modes.passThrough && this.shouldPass(event) ||
!this.processor && event.type === "keydown"
&& options.get("passunknown").getKey(modes.main.allBases)
&& !(modes.main.count && /^\d$/.test(key) ||
modes.main.allBases.some(
mode => mappings.hives
.some(hive => hive.get(mode, key)
|| hive.getCandidates(mode, key))));
let hasCandidates = mode => {
return mappings.hives.some(hive => (hive.get(mode, key, true) ||
hive.getCandidates(mode, key, true)));
};
let pass = (() => {
if (this.passing && !event.isMacro)
return true;
if (DOM.Event.feedingEvent && DOM.Event.feedingEvent.isReplay)
return true;
if (event.isReplay)
return true;
if (modes.main == modes.PASS_THROUGH)
return true;
if (modes.main == modes.QUOTE &&
modes.getStack(1).main !== modes.PASS_THROUGH &&
!this.shouldPass(event))
return true;
if (!modes.passThrough && this.shouldPass(event))
return true;
if (!this.processor && event.type === "keydown" &&
options.get("passunknown").getKey(modes.main.allBases)) {
if (!(modes.main.count && /^\d$/.test(key)))
return true;
if (modes.main.allBases.some(hasCandidates))
return true;
}
return false;
})();
events.dbg("ON " + event.type.toUpperCase() + " " + key +
" passing: " + this.passing + " " +