mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2025-12-22 05:57:59 +01:00
Import fixes from groups branch.
This commit is contained in:
@@ -1330,7 +1330,7 @@ var Commands = Module("commands", {
|
||||
args["-description"],
|
||||
Command.bindMacro(args, "-ex",
|
||||
function makeParams(args, modifiers) ({
|
||||
args: {
|
||||
args: {
|
||||
__proto__: args,
|
||||
toString: function () this.string,
|
||||
},
|
||||
|
||||
@@ -57,8 +57,10 @@ var ProcessorStack = Class("ProcessorStack", {
|
||||
events.feedingKeys = false;
|
||||
}
|
||||
|
||||
for (var res = this.actions[0]; callable(res);)
|
||||
res = res();
|
||||
for (var res = this.actions[0]; callable(res);) {
|
||||
res = dactyl.trapErrors(res);
|
||||
dbg("ACTION RES: " + res);
|
||||
}
|
||||
result = res === Events.PASS ? Events.PASS : Events.KILL;
|
||||
}
|
||||
else if (result !== Events.KILL && !this.actions.length &&
|
||||
|
||||
@@ -424,7 +424,7 @@ var Modes = Module("modes", {
|
||||
|
||||
hidden: false,
|
||||
|
||||
input: false,
|
||||
input: Class.memoize(function () this.bases.length && this.bases.some(function (b) b.input)),
|
||||
|
||||
get passUnknown() this.input,
|
||||
|
||||
|
||||
@@ -165,22 +165,16 @@ var RangeFinder = Module("rangefinder", {
|
||||
modes: function (dactyl, modules, window) {
|
||||
const { modes } = modules;
|
||||
modes.addMode("FIND", {
|
||||
extended: true,
|
||||
description: "Find mode, active when typing search input",
|
||||
bases: [modes.COMMAND_LINE],
|
||||
input: true
|
||||
});
|
||||
modes.addMode("FIND_FORWARD", {
|
||||
extended: true,
|
||||
description: "Forward Find mode, active when typing search input",
|
||||
bases: [modes.FIND],
|
||||
input: true
|
||||
bases: [modes.FIND]
|
||||
});
|
||||
modes.addMode("FIND_BACKWARD", {
|
||||
extended: true,
|
||||
description: "Backward Find mode, active when typing search input",
|
||||
bases: [modes.FIND],
|
||||
input: true
|
||||
bases: [modes.FIND]
|
||||
});
|
||||
},
|
||||
commands: function (dactyl, modules, window) {
|
||||
@@ -191,7 +185,8 @@ var RangeFinder = Module("rangefinder", {
|
||||
{ argCount: "0" });
|
||||
},
|
||||
commandline: function (dactyl, modules, window) {
|
||||
this.CommandMode = Class("CommandFindMode", modules.CommandMode, {
|
||||
const { rangefinder } = modules;
|
||||
rangefinder.CommandMode = Class("CommandFindMode", modules.CommandMode, {
|
||||
init: function init(mode) {
|
||||
this.mode = mode;
|
||||
init.supercall(this);
|
||||
|
||||
Reference in New Issue
Block a user