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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
common/content/abbreviations.js
View File

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

2
common/modules/contexts.jsm
View File

@@ -546,7 +546,7 @@ var Contexts = Module("contexts", {
if (callable(params)) if (callable(params))
action = dactyl.userEval("(function action() { with (action.makeParams(this, arguments)) {" + args.literalArg + "} })"); action = dactyl.userEval("(function action() { with (action.makeParams(this, arguments)) {" + args.literalArg + "} })");
else 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; process = function (param) isObject(param) && param.valueOf ? param.valueOf() : param;
action.params = params; action.params = params;
action.makeParams = makeParams; action.makeParams = makeParams;