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

Revert last revision.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-03 09:06:52 -05:00
parent 4a09c97eb1
commit e470de350c
10 changed files with 39 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
common/content/commands.js
View File

@@ -468,7 +468,7 @@ var Commands = Module("commands", {
_addCommand: function (args, replace) {
if (!args[3])
args[3] = {};
args[3].definedAt = Commands.getCaller(Components.stack.caller.caller);
args[3].definedAt = commands.getCaller(Components.stack.caller.caller);
let names = array.flatten(Command.parseSpecs(args[0]));
args.parsedSpecs = names;
@@ -659,6 +659,23 @@ var Commands = Module("commands", {
return this._exCommands.filter(function (cmd) cmd.user);
},
/**
* Returns a frame object describing the currently executing
* command, if applicable, otherwise returns the passed frame.
*
* @param {nsIStackFrame} frame
*/
getCaller: function (frame) {
if (io.sourcing)
return {
__proto__: frame,
filename: io.sourcing.file[0] == "[" ? io.sourcing.file :
services.io.newFileURI(File(io.sourcing.file)).spec,
lineNumber: io.sourcing.line
};
return frame;
},
/**
* Returns true if a command invocation contains a URL referring to the
* domain *host*.
@@ -1162,23 +1179,6 @@ var Commands = Module("commands", {
delete this._exMap[name];
}
}, {
/**
* Returns a frame object describing the currently executing
* command, if applicable, otherwise returns the passed frame.
*
* @param {nsIStackFrame} frame
*/
getCaller: function (frame) {
if (io.sourcing)
return {
__proto__: frame,
filename: io.sourcing.file[0] == "[" ? io.sourcing.file :
services.io.newFileURI(File(io.sourcing.file)).spec,
lineNumber: io.sourcing.line
};
return frame;
},
// returns [count, parsed_argument]
parseArg: function parseArg(str, sep, keepQuotes) {
let arg = "";