1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-28 15:22:26 +01:00

Fix RC serialization and RHS expansion in abbreviations using -js.

Fixes issue #911.
This commit is contained in:
Doug Kearns
2013-08-14 22:28:28 +10:00
parent 8a3f8fda4b
commit e5864bfd23
2 changed files with 2 additions and 2 deletions

View File

@@ -347,7 +347,7 @@ var Abbreviations = Module("abbreviations", {
arguments: [abbr.lhs],
literalArg: abbr.rhs,
options: {
"-javascript": abbr.rhs ? null : undefined
"-javascript": callable(abbr.rhs) ? null : undefined
}
}
for ([, abbr] in Iterator(abbreviations.user.merged))

View File

@@ -546,7 +546,7 @@ var Contexts = Module("contexts", {
if (callable(params))
action = dactyl.userEval("(function action() { with (action.makeParams(this, arguments)) {" + args.literalArg + "} })");
else
action = dactyl.userFunc.apply(dactyl, params.concat(args.literalArg).array);
action = dactyl.userFunc.apply(dactyl, params.concat(args.literalArg));
process = function (param) isObject(param) && param.valueOf ? param.valueOf() : param;
action.params = params;
action.makeParams = makeParams;