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

[bootstrap] Minor fixes.

Browse Source 
--HG--
branch : bootstrapped
This commit is contained in:
Kris Maglione
2010-12-24 20:37:39 -05:00
parent adeb5f7dd2
commit d0b5a5b209
4 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
common/content/commands.js
View File

@@ -80,7 +80,7 @@ update(CommandOption, {
* E.g. "foo,bar" * E.g. "foo,bar"
* @final * @final
*/ */
LIST: ArgType("list", function (arg) arg && arg.split(/\s*,\s*/)) LIST: ArgType("list", function (arg, quoted) Option.splitList(quoted))
}); });
/** /**
@@ -748,7 +748,10 @@ const Commands = Module("commands", {
*/ */
parseArgs: function (str, params) { parseArgs: function (str, params) {
try { try {
function getNextArg(str) { function getNextArg(str, _keepQuotes) {
if (arguments.length < 2)
_keepQuotes = keepQuotes;
if (str.substr(0, 2) === "<<" && hereDoc) { if (str.substr(0, 2) === "<<" && hereDoc) {
let arg = /^<<(\S*)/.exec(str)[1]; let arg = /^<<(\S*)/.exec(str)[1];
let count = arg.length + 2; let count = arg.length + 2;
@@ -756,7 +759,7 @@ const Commands = Module("commands", {
return [count, "", ""]; return [count, "", ""];
return [count, io.readHeredoc(arg), ""]; return [count, io.readHeredoc(arg), ""];
} }
let [count, arg, quote] = Commands.parseArg(str, null, keepQuotes); let [count, arg, quote] = Commands.parseArg(str, null, _keepQuotes);
if (quote == "\\" && !complete) if (quote == "\\" && !complete)
return [, , , "Trailing \\"]; return [, , , "Trailing \\"];
if (quote && !complete) if (quote && !complete)
@@ -782,7 +785,7 @@ const Commands = Module("commands", {
var invalid = false; var invalid = false;
// FIXME: best way to specify these requirements? // FIXME: best way to specify these requirements?
var onlyArgumentsRemaining = allowUnknownOptions || options.length == 0; // after a -- has been found var onlyArgumentsRemaining = allowUnknownOptions || options.length == 0; // after a -- has been found
var arg = null; var arg = null, quoted = null;
var count = 0; // the length of the argument var count = 0; // the length of the argument
var i = 0; var i = 0;
var completeOpts; var completeOpts;
@@ -845,12 +848,14 @@ const Commands = Module("commands", {
for (let [, optname] in Iterator(opt.names)) { for (let [, optname] in Iterator(opt.names)) {
if (sub.indexOf(optname) == 0) { if (sub.indexOf(optname) == 0) {
invalid = false; invalid = false;
quoted = null;
arg = null; arg = null;
quote = null; quote = null;
count = 0; count = 0;
let sep = sub[optname.length]; let sep = sub[optname.length];
if (sep == "=" || /\s/.test(sep) && opt.type != CommandOption.NOARG) { if (sep == "=" || /\s/.test(sep) && opt.type != CommandOption.NOARG) {
[count, arg, quote, error] = getNextArg(sub.substr(optname.length + 1)); [count, quoted, quote, error] = getNextArg(sub.substr(optname.length + 1), true);
arg = Option.dequote(quoted);
dactyl.assert(!error, error); dactyl.assert(!error, error);
// if we add the argument to an option after a space, it MUST not be empty // if we add the argument to an option after a space, it MUST not be empty
@@ -879,7 +884,7 @@ const Commands = Module("commands", {
if (!complete || arg != null) { if (!complete || arg != null) {
if (opt.type) { if (opt.type) {
let orig = arg; let orig = arg;
arg = opt.type.parse(arg); arg = opt.type.parse(arg, quoted);
if (complete && isArray(arg)) { if (complete && isArray(arg)) {
args.completeFilter = arg[arg.length - 1]; args.completeFilter = arg[arg.length - 1];
@@ -896,7 +901,7 @@ const Commands = Module("commands", {
// we have a validator function // we have a validator function
if (typeof opt.validator == "function") { if (typeof opt.validator == "function") {
if (opt.validator.call(this, arg) == false) { if (opt.validator.call(this, arg, quoted) == false) {
fail("Invalid argument for option: " + optname); fail("Invalid argument for option: " + optname);
if (complete) // Always true. if (complete) // Always true.
complete.highlight(args.completeStart, count - 1, "SPELLCHECK"); complete.highlight(args.completeStart, count - 1, "SPELLCHECK");
@@ -904,11 +909,12 @@ const Commands = Module("commands", {
} }
} }
// option allowed multiple times if (arg != null || opt.type == CommandOption.NOARG)
if (opt.multiple) // option allowed multiple times
args[opt.names[0]] = (args[opt.names[0]] || []).concat(arg); if (opt.multiple)
else args[opt.names[0]] = (args[opt.names[0]] || []).concat(arg);
args[opt.names[0]] = opt.type == CommandOption.NOARG || arg; else
args[opt.names[0]] = opt.type == CommandOption.NOARG || arg;
i += optname.length + count; i += optname.length + count;
if (i == str.length) if (i == str.length)

29
common/content/io.js
View File

@@ -13,20 +13,21 @@ plugins.contexts = {};
function Script(file) { function Script(file) {
let self = set.has(plugins, file.path) && plugins[file.path]; let self = set.has(plugins, file.path) && plugins[file.path];
if (self) { if (self) {
if (self.onUnload) if (set.has(self, "onUnload"))
self.onUnload(); self.onUnload();
} }
else { else {
self = { __proto__: plugins }; self = update({ __proto__: plugins }, {
plugins[file.path] = self; NAME: file.leafName.replace(/\..*/, "").replace(/-([a-z])/g, function (m, n1) n1.toUpperCase()),
self.NAME = file.leafName.replace(/\..*/, "").replace(/-([a-z])/g, function (m, n1) n1.toUpperCase()); PATH: file.path,
self.PATH = file.path; CONTEXT: self
self.CONTEXT = self; });
Class.replaceProperty(plugins, file.path, self);
// This belongs elsewhere // This belongs elsewhere
if (io.getRuntimeDirectories("plugins").some( if (io.getRuntimeDirectories("plugins").some(
function (dir) dir.contains(file, false))) function (dir) dir.contains(file, false)))
plugins[self.NAME] = self; Class.replaceProperty(plugins, self.NAME, self);
} }
plugins.contexts[file.path] = self; plugins.contexts[file.path] = self;
return self; return self;
@@ -67,6 +68,13 @@ const IO = Module("io", {
services.downloadManager.addListener(this.downloadListener); services.downloadManager.addListener(this.downloadListener);
}, },
destroy: function () {
services.downloadManager.removeListener(this.downloadListener);
for (let [, plugin] in Iterator(plugins.contexts))
if (plugin.onUnload)
plugin.onUnload();
},
// TODO: there seems to be no way, short of a new component, to change // TODO: there seems to be no way, short of a new component, to change
// the process's CWD - see https://bugzilla.mozilla.org/show_bug.cgi?id=280953 // the process's CWD - see https://bugzilla.mozilla.org/show_bug.cgi?id=280953
/** /**
@@ -111,13 +119,6 @@ const IO = Module("io", {
return this.cwd; return this.cwd;
}, },
destroy: function () {
services.downloadManager.removeListener(this.downloadListener);
for (let [, plugin] in Iterator(plugins.contexts))
if (plugin.onUnload)
plugin.onUnload();
},
/** /**
* @property {function} File class. * @property {function} File class.
* @final * @final

2
common/modules/overlay.jsm
View File

@@ -7,7 +7,7 @@
Components.utils.import("resource://dactyl/base.jsm"); Components.utils.import("resource://dactyl/base.jsm");
defineModule("overlay", { defineModule("overlay", {
exports: ["ModuleBase"], exports: ["ModuleBase"],
require: ["sanitizer", "services", "template", "util"], require: ["highlight", "sanitizer", "services", "template", "util"],
}); });
/** /**

4
common/modules/util.jsm
View File

@@ -932,11 +932,13 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
}, },
"dactyl-rehash": function () { "dactyl-rehash": function () {
util.dump("dactyl: util: observe: dactyl-rehash"); util.dump("dactyl: util: observe: dactyl-rehash");
for (let module in values(defineModule.modules)) for (let module in values(defineModule.modules)) {
util.dump("dactyl: util: init(" + module + ")");
if (module.reinit) if (module.reinit)
module.reinit(); module.reinit();
else else
module.init(); module.init();
}
}, },
"toplevel-window-ready": function (window, data) { "toplevel-window-ready": function (window, data) {
window.addEventListener("DOMContentLoaded", wrapCallback(function listener(event) { window.addEventListener("DOMContentLoaded", wrapCallback(function listener(event) {