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