1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-06 13:34:13 +01:00

Replace :abc, :comc, :mapc with :unab!, :delc!, :unmap!. Add bang to :styt, :delsty, ...

This commit is contained in:
Kris Maglione
2011-02-11 16:06:19 -05:00
parent 35c70faa26
commit 7ca9b9cfea
4 changed files with 41 additions and 67 deletions

View File

@@ -622,6 +622,7 @@ var Commands = Module("commands", {
* Displays a list of user-defined commands.
*/
list: function list() {
const { commandline, completion } = this.modules;
function completerToString(completer) {
if (completer)
return [k for ([k, v] in Iterator(config.completers)) if (completer == completion.closure[v])][0] || "custom";
@@ -631,7 +632,7 @@ var Commands = Module("commands", {
if (!this.userHives.some(function (h) h._list.length))
dactyl.echomsg("No user-defined commands found");
else
modules.commandline.commandOutput(
commandline.commandOutput(
<table>
<tr highlight="Title">
<td/>
@@ -1487,13 +1488,22 @@ var Commands = Module("commands", {
.flatten().array
});
commands.add(["comc[lear]"],
"Delete all user-defined commands",
commands.add(["delc[ommand]"],
"Delete the specified user-defined command",
function (args) {
args["-group"].clear();
},
{
argCount: "0",
util.assert(args.bang ^ !!args[0], "Argument or ! required");
let name = args[0];
if (args.bang)
args["-group"].clear();
else if (args["-group"].get(name))
args["-group"].remove(name);
else
dactyl.echoerr("E184: No such user-defined command: " + name);
}, {
argCount: "?",
bang: true,
completer: function (context, args) modules.completion.userCommand(context, args["-group"]),
options: [contexts.GroupFlag("commands")]
});
@@ -1506,21 +1516,6 @@ var Commands = Module("commands", {
literal: 0
});
commands.add(["delc[ommand]"],
"Delete the specified user-defined command",
function (args) {
let name = args[0];
if (args["-group"].get(name))
args["-group"].remove(name);
else
dactyl.echoerr("E184: No such user-defined command: " + name);
}, {
argCount: "1",
completer: function (context, args) modules.completion.userCommand(context, args["-group"]),
options: [contexts.GroupFlag("commands")]
});
dactyl.addUsageCommand({
name: ["listc[ommands]", "lc"],
description: "List all Ex commands along with their short descriptions",

View File

@@ -636,14 +636,18 @@ var Styles = Module("Styles", {
{
name: ["dels[tyle]"],
desc: "Remove a user style sheet",
action: function (sheet) sheet.remove()
action: function (sheet) sheet.remove(),
}
].forEach(function (cmd) {
commands.add(cmd.name, cmd.desc,
function (args) {
dactyl.assert(args.bang ^ !!(args[0] || args[1] || args["-name"] || args["-index"]),
"Argument or ! required");
args["-group"].find(args["-name"], args[0], args.literalArg, args["-index"])
.forEach(cmd.action);
}, {
bang: true,
completer: function (context, args) {
let uris = util.visibleURIs(window.content);