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

Fix addons.jsm on FF36.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-27 01:44:18 -05:00
parent 197850aeca
commit 9403511795
6 changed files with 73 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/content/events.js
View File

@@ -138,7 +138,7 @@ var ProcessorStack = Class("ProcessorStack", {
if (result === Events.KILL)
this.actions = [];
else if (!this.actions.length)
else if (!this.actions.length && !processors.length)
for (let input in values(this.processors))
if (input.fallthrough) {
if (result === Events.KILL)
@@ -1330,11 +1330,11 @@ var Events = Module("events", {
};
},
mappings: function () {
mappings.add(modes.all,
mappings.add(modes.MAIN,
["<C-z>", "<pass-all-keys>"], "Temporarily ignore all " + config.appName + " key bindings",
function () { modes.push(modes.PASS_THROUGH); });
mappings.add(modes.all,
mappings.add(modes.MAIN,
["<C-v>", "<pass-next-key>"], "Pass through next key",
function () {
if (modes.main == modes.QUOTE)
@@ -1342,12 +1342,12 @@ var Events = Module("events", {
modes.push(modes.QUOTE);
});
mappings.add(modes.all,
mappings.add(modes.BASE,
["<Nop>"], "Do nothing",
function () {});
// macros
mappings.add([modes.NORMAL, modes.TEXT_AREA, modes.PLAYER].filter(util.identity),
mappings.add([modes.COMMAND],
["q", "<record-macro>"], "Record a key sequence into a macro",
function ({ arg }) {
events._macroKeys.pop();
@@ -1355,7 +1355,7 @@ var Events = Module("events", {
},
{ get arg() !modes.recording });
mappings.add([modes.NORMAL, modes.TEXT_AREA, modes.PLAYER].filter(util.identity),
mappings.add([modes.COMMAND],
["@", "<play-macro>"], "Play a macro",
function ({ arg, count }) {
count = Math.max(count, 1);