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

Make further use of default parameters.

Browse Source 
--HG--
extra : rebase_source : ab666bce7ed7e47c8f1e2bc4145f553da990d319
This commit is contained in:
Doug Kearns
2013-10-06 22:33:59 +11:00
parent cf7e0c479d
commit 4872666ef5
18 changed files with 49 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
common/modules/commands.jsm
View File

@@ -155,15 +155,13 @@ var Command = Class("Command", {
* @param {Args} args The Args object passed to {@link #action}.
* @param {Object} modifiers Any modifiers to be passed to {@link #action}.
*/
execute: function execute(args, modifiers) {
execute: function execute(args, modifiers = {}) {
const { dactyl } = this.modules;
let context = args.context;
if (this.deprecated)
this.warn(context, "deprecated", _("warn.deprecated", ":" + this.name, this.deprecated));
modifiers = modifiers || {};
if (args.count != null && !this.count)
throw FailedAssertion(_("command.noCount"));
if (args.bang && !this.bang)
@@ -543,21 +541,21 @@ var CommandHive = Class("CommandHive", Contexts.Hive, {
repeat: null,
/**
* Adds a new command to the builtin hive. Accessible only to core
* dactyl code. Plugins should use group.commands.add instead.
* Adds a new command to the builtin hive. Accessible only to core dactyl
* code. Plugins should use group.commands.add instead.
*
* @param {[string]} specs The names by which this command can be
* invoked. The first name specified is the command's canonical
* name.
* @param {[string]} specs The names by which this command can be invoked.
* The first name specified is the command's canonical name.
* @param {string} description A description of the command.
* @param {function} action The action invoked by this command.
* @param {Object} extra An optional extra configuration hash.
* @optional
* @optional
* @param {boolean} replace Replace an existing command of the same name.
* @optional
*/
add: function add(specs, description, action, extra, replace) {
add: function add(specs, description, action, extra = {}, replace = false) {
const { commands, contexts } = this.modules;
extra = extra || {};
if (!extra.definedAt)
extra.definedAt = contexts.getCaller(Components.stack.caller);
if (!extra.sourceModule)
@@ -594,10 +592,8 @@ var CommandHive = Class("CommandHive", Contexts.Hive, {
return name;
},
_add: function _add(names, description, action, extra, replace) {
_add: function _add(names, description, action, extra = {}, replace = false) {
const { contexts } = this.modules;
extra = extra || {};
extra.definedAt = contexts.getCaller(Components.stack.caller.caller);
return this.add.apply(this, arguments);
},
@@ -968,7 +964,7 @@ var Commands = Module("commands", {
* Args object.
* @returns {Args}
*/
parseArgs: function parseArgs(str, params) {
parseArgs: function parseArgs(str, params = {}) {
const self = this;
function getNextArg(str, _keepQuotes=keepQuotes) {
@@ -990,7 +986,7 @@ var Commands = Module("commands", {
try {
var { allowUnknownOptions, argCount, complete, extra, hereDoc, literal, options, keepQuotes } = params || {};
var { allowUnknownOptions, argCount, complete, extra, hereDoc, literal, options, keepQuotes } = params;
if (!options)
options = [];
@@ -1776,8 +1772,7 @@ var Commands = Module("commands", {
}
});
let quote = function quote(q, list, map) {
map = map || Commands.quoteMap;
let quote = function quote(q, list, map = Commands.quoteMap) {
let re = RegExp("[" + list + "]", "g");
function quote(str) (q + String.replace(str, re, $0 => ($0 in map ? map[$0] : ("\\" + $0)))
+ q);