gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-20 17:57:58 +01:00
Code Issues Projects Releases Wiki Activity

Return a sane format from Option#value, rename {join,parse}Values to stringify/parse (c.f. JSON), and deprecate Option#values.

Browse Source
This commit is contained in:
Kris Maglione
2010-10-11 04:40:07 -04:00
parent e95bb3708c
commit b2a70aea71
5 changed files with 75 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
common/content/dactyl.js
View File

@@ -25,16 +25,19 @@ const FailedAssertion = Class("FailedAssertion", Error, {
}
});
function deprecated(reason, fn) update(
function deprecatedMethod() {
let frame = Components.stack.caller;
if (!set.add(deprecatedMethod.seen, frame.filename))
dactyl.echoerr(frame.filename + ":" + frame.lineNumber + ": " +
(this.className || this.constructor.className) + "." + fn.name +
" is deprecated: " + reason);
return fn.apply(this, arguments);
},
{ seen: { "chrome://dactyl/content/javascript.js": true } });
function deprecated(reason, fn, name)
let (func = (callable(fn) ? fn : function () this[fn].apply(this, arguments)))
update(function deprecatedMethod() {
let frame = Components.stack.caller;
if (!set.add(deprecatedMethod.seen, frame.filename))
dactyl.echoerr(
frame.filename.replace(/^.*? -> /, "") +
":" + frame.lineNumber + ": " +
(this.className || this.constructor.className) + "." +
(fn.name || name) + " is deprecated: " + reason);
return func.apply(this, arguments);
},
{ seen: { "chrome://dactyl/content/javascript.js": true } });
const Dactyl = Module("dactyl", {
init: function () {
@@ -243,7 +246,8 @@ const Dactyl = Module("dactyl", {
if (typeof str == "object" && "echoerr" in str)
str = str.echoerr;
else if (isinstance(str, ["Error"]))
str = str.fileName + ":" + str.lineNumber + ": " + str;
str = str.fileName.replace(/^.*? -> /, "")
+ ":" + str.lineNumber + ": " + str;
if (options["errorbells"])
dactyl.beep();
@@ -619,7 +623,7 @@ const Dactyl = Module("dactyl", {
<spec>{spec((obj.specs || obj.names)[0])}</spec>{
!obj.type ? "" : <>
<type>{obj.type}</type>
<default>{obj.defaultValue}</default></>}
<default>{opt.stringify(obj.defaultValue)}</default></>}
<description>{
obj.description ? br+<p>{obj.description.replace(/\.?$/, ".")}</p> : "" }{
extraHelp ? br+extraHelp : "" }{