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

Prevent certain sites from overriding mappings. Closes issue #118.

Browse Source
This commit is contained in:
Kris Maglione
2015-12-30 16:49:40 -08:00
parent 31c6df0257
commit 4904fb5bff
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/content/events.js
View File

@@ -97,7 +97,9 @@ var EventHive = Class("EventHive", Contexts.Hive, {
* @instance events
*/
var Events = Module("events", {
dbg: function () {},
dbg: function (...args) {
util.dump(...args);
},
debug: false,
@@ -818,11 +820,13 @@ var Events = Module("events", {
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.count && /^\d$/.test(key))
return false;
if (modes.main.allBases.some(hasCandidates))
return true;
return false;
return true;
}
return false;

3
common/content/mappings.js
View File

@@ -245,8 +245,9 @@ var MapHive = Class("MapHive", Contexts.Hive, {
get: function (mode, cmd, skipPassThrough = false) {
let map = this.getStack(mode).mappings[cmd];
if (skipPassThrough && map && !map.passThrough)
if (skipPassThrough && map && map.passThrough)
return null;
return map;
},