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

Fix a bug in replacing user commands. Closes issue #88.

Browse Source 
--HG--
extra : rebase_source : 3d5045b548a81ec70e43ab1e3d006a975f95b974
This commit is contained in:
Kris Maglione
2010-10-15 14:10:06 -04:00
parent 81aa34c418
commit c683abc281
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/content/commandline.js
View File

@@ -663,7 +663,8 @@ const CommandLine = Module("commandline", {
this._echoMultiline(<span highlight="Message">{this._lastEcho}</span>, this._echoMultiline(<span highlight="Message">{this._lastEcho}</span>,
this.widgets.message[0], true); this.widgets.message[0], true);
if (action === this._echoLine && !(flags & this.FORCE_MULTILINE) && !this.widgets.mowContainer.collapsed) { if (action === this._echoLine && !(flags & this.FORCE_MULTILINE)
&& !(dactyl.fullyInitialized && this.widgets.mowContainer.collapsed)) {
highlightGroup += " Message"; highlightGroup += " Message";
action = this._echoMultiline; action = this._echoMultiline;
} }

11
common/content/commands.js
View File

@@ -8,12 +8,13 @@
/** @scope modules */ /** @scope modules */
// Do NOT create instances of this class yourself, use the helper method
// commands.add() instead
/** /**
* A structure representing the options available for a command. * A structure representing the options available for a command.
* *
* Do NOT create instances of this class yourself, use the helper method
* {@see Commands#add} instead
*
* @property {[string]} names An array of option names. The first name * @property {[string]} names An array of option names. The first name
* is the canonical option name. * is the canonical option name.
* @property {number} type The option's value type. This is one of: * @property {number} type The option's value type. This is one of:
@@ -334,7 +335,7 @@ const Commands = Module("commands", {
_addCommand: function (args, replace) { _addCommand: function (args, replace) {
let names = array.flatten(Command.parseSpecs(args[0])); let names = array.flatten(Command.parseSpecs(args[0]));
dactyl.assert(!names.some(function (name) name in this._exMap && !this._exMap[name].user, this), dactyl.assert(!names.some(function (name) name in this._exMap && !this._exMap[name].user, this),
"E182: Can't replace non-user command: " + args[0]); "E182: Can't replace non-user command: " + args[0][0]);
if (!replace || !(args[3] && args[3].user)) if (!replace || !(args[3] && args[3].user))
dactyl.assert(!names.some(function (name) name in this._exMap, this), dactyl.assert(!names.some(function (name) name in this._exMap, this),
"Not replacing command " + args[0]); "Not replacing command " + args[0]);
@@ -937,9 +938,9 @@ const Commands = Module("commands", {
removeUserCommand: function (name) { removeUserCommand: function (name) {
let cmd = this.get(name); let cmd = this.get(name);
dactyl.assert(cmd.user, "E184: No such user-defined command: " + name); dactyl.assert(cmd.user, "E184: No such user-defined command: " + name);
for (let name in array.iterValues(cmd.names)) this._exCommands = this._exCommands.filter(function (c) c !== cmd);
for (let name in values(cmd.names))
delete this._exMap[name]; delete this._exMap[name];
this._exCommands = this._exCommands.filter(function (c) c != cmd);
}, },
// FIXME: still belong here? Also used for autocommand parameters. // FIXME: still belong here? Also used for autocommand parameters.

1
common/content/dactyl.js
View File

@@ -2045,6 +2045,7 @@ const Dactyl = Module("dactyl", {
dactyl.execute(cmd); dactyl.execute(cmd);
}); });
dactyl.fullyInitialized = true;
dactyl.triggerObserver("enter", null); dactyl.triggerObserver("enter", null);
autocommands.trigger("Enter", {}); autocommands.trigger("Enter", {});
}, 0); }, 0);

4
common/modules/sanitizer.jsm
View File

@@ -443,7 +443,7 @@ const Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakR
services.get("permissions").remove(uri, "cookie"); services.get("permissions").remove(uri, "cookie");
services.get("permissions").add(uri, "cookie", Sanitizer.PERMS[perm]); services.get("permissions").add(uri, "cookie", Sanitizer.PERMS[perm]);
} }
commands.addUserCommand(["cookies", "ck"], commands.add(["cookies", "ck"],
"Change cookie permissions for sites.", "Change cookie permissions for sites.",
function (args) { function (args) {
let host = args.shift(); let host = args.shift();
@@ -497,7 +497,7 @@ const Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakR
break; break;
} }
}, },
}, true); });
}, },
completion: function (dactyl, modules, window) { completion: function (dactyl, modules, window) {
modules.completion.visibleHosts = function completeHosts(context) { modules.completion.visibleHosts = function completeHosts(context) {