gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-06 21:14:11 +01:00
Code Issues Projects Releases Wiki Activity

Rename stringToURLArray ⇒ parseURLs.

Browse Source
This commit is contained in:
Kris Maglione
2010-10-11 15:50:23 -04:00
parent f4ddaafb9e
commit 7f2126179e
4 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
common/content/dactyl.js
View File

@@ -25,19 +25,24 @@ const FailedAssertion = Class("FailedAssertion", Error, {
}
});
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 } });
function deprecated(reason, fn) {
let name, func = callable(fn) ? fn : function () this[fn].apply(this, arguments);
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);
}
deprecatedMethod.seen = { "chrome://dactyl/content/javascript.js": true };
return callable(fn) ? deprecatedMethod : Class.Property({
get: function () deprecatedMethod,
init: function (prop) { name = prop }
});
}
const Dactyl = Module("dactyl", {
init: function () {
@@ -746,7 +751,7 @@ const Dactyl = Module("dactyl", {
*
* @param {string|Array} urls A representation of the URLs to open. May be
* either a string, which will be passed to
* {@see Dactyl#stringToURLArray}, or an array in the same format as
* {@see Dactyl#parseURLs}, or an array in the same format as
* would be returned by the same.
* @param {object} params A set of parameters specifying how to open the
* URLs. The following properties are recognized:
@@ -770,7 +775,7 @@ const Dactyl = Module("dactyl", {
*/
open: function (urls, params, force) {
if (typeof urls == "string")
urls = dactyl.stringToURLArray(urls);
urls = dactyl.parseURLs(urls);
if (urls.length > 20 && !force)
return commandline.input("This will open " + urls.length + " new tabs. Would you like to continue? (yes/[no]) ",
@@ -884,7 +889,8 @@ const Dactyl = Module("dactyl", {
* @param {string} str
* @returns {string[]}
*/
stringToURLArray: function stringToURLArray(str) {
stringToURLArray: deprecated("Please use dactyl.parseURLs instead", "parseURLs"),
parseURLs: function parseURLs(str) {
let urls;
if (options["urlseparator"])