1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-04-07 13:53:33 +02:00

Default arguments ftw.

This commit is contained in:
Kris Maglione
2013-09-21 16:57:09 -07:00
parent 25aae2cc99
commit 35784406a0
8 changed files with 14 additions and 30 deletions

View File

@@ -377,10 +377,7 @@ var StatusLine = Module("statusline", {
* @param {number} percent The zoom level, as a percentage. @optional * @param {number} percent The zoom level, as a percentage. @optional
* @param {boolean} full True if full zoom is in operation. @optional * @param {boolean} full True if full zoom is in operation. @optional
*/ */
updateZoomLevel: function updateZoomLevel(percent, full) { updateZoomLevel: function updateZoomLevel(percent=buffer.zoomLevel, full=buffer.fullZoom) {
if (arguments.length == 0)
[percent, full] = [buffer.zoomLevel, buffer.fullZoom];
if (percent == 100) if (percent == 100)
this.widgets.zoomlevel.value = ""; this.widgets.zoomlevel.value = "";
else { else {

View File

@@ -971,10 +971,7 @@ var Commands = Module("commands", {
parseArgs: function parseArgs(str, params) { parseArgs: function parseArgs(str, params) {
const self = this; const self = this;
function getNextArg(str, _keepQuotes) { function getNextArg(str, _keepQuotes=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;

View File

@@ -65,10 +65,7 @@ var Group = Class("Group", {
get builtin() this.modules.contexts.builtinGroups.indexOf(this) >= 0, get builtin() this.modules.contexts.builtinGroups.indexOf(this) >= 0,
}, { }, {
compileFilter: function (patterns, default_ = false) { compileFilter: function (patterns, default_=false) {
if (arguments.length < 2)
default_ = false;
function siteFilter(uri) function siteFilter(uri)
let (match = array.nth(siteFilter.filters, f => f(uri), 0)) let (match = array.nth(siteFilter.filters, f => f(uri), 0))
match ? match.result : default_; match ? match.result : default_;

View File

@@ -1090,12 +1090,10 @@ var DOM = Class("DOM", {
* @param {string} keys Messy form. * @param {string} keys Messy form.
* @param {boolean} unknownOk Whether unknown keys are passed * @param {boolean} unknownOk Whether unknown keys are passed
* through rather than being converted to <lt>keyname>. * through rather than being converted to <lt>keyname>.
* @default false * @default true
* @returns {string} Canonical form. * @returns {string} Canonical form.
*/ */
canonicalKeys: function canonicalKeys(keys, unknownOk) { canonicalKeys: function canonicalKeys(keys, unknownOk=true) {
if (arguments.length === 1)
unknownOk = true;
return this.parse(keys, unknownOk).map(this.closure.stringify).join(""); return this.parse(keys, unknownOk).map(this.closure.stringify).join("");
}, },
@@ -1122,16 +1120,13 @@ var DOM = Class("DOM", {
* @param {string} keys The string to parse. * @param {string} keys The string to parse.
* @param {boolean} unknownOk Whether unknown keys are passed * @param {boolean} unknownOk Whether unknown keys are passed
* through rather than being converted to <lt>keyname>. * through rather than being converted to <lt>keyname>.
* @default false * @default true
* @returns {Array[Object]} * @returns {Array[Object]}
*/ */
parse: function parse(input, unknownOk) { parse: function parse(input, unknownOk=true) {
if (isArray(input)) if (isArray(input))
return array.flatten(input.map(k => this.parse(k, unknownOk))); return array.flatten(input.map(k => this.parse(k, unknownOk)));
if (arguments.length === 1)
unknownOk = true;
let out = []; let out = [];
for (let match in util.regexp.iterate(/<.*?>?>|[^<]|<(?!.*>)/g, input)) { for (let match in util.regexp.iterate(/<.*?>?>|[^<]|<(?!.*>)/g, input)) {
let evt_str = match[0]; let evt_str = match[0];

View File

@@ -75,9 +75,7 @@ var RangeFinder = Module("rangefinder", {
this.find("", mode == this.modes.FIND_BACKWARD); this.find("", mode == this.modes.FIND_BACKWARD);
}, },
bootstrap: function bootstrap(str, backward) { bootstrap: function bootstrap(str, backward=this.rangeFind && this.rangeFind.reverse) {
if (arguments.length < 2 && this.rangeFind)
backward = this.rangeFind.reverse;
let highlighted = this.rangeFind && this.rangeFind.highlighted; let highlighted = this.rangeFind && this.rangeFind.highlighted;
let selections = this.rangeFind && this.rangeFind.selections; let selections = this.rangeFind && this.rangeFind.selections;

View File

@@ -266,8 +266,8 @@ var IO = Module("io", {
*/ */
File: Class.Memoize(function () let (io = this) File: Class.Memoize(function () let (io = this)
Class("File", File, { Class("File", File, {
init: function init(path, checkCWD) init: function init(path, checkCWD=true)
init.supercall(this, path, (arguments.length < 2 || checkCWD) && io.cwd) init.supercall(this, path, checkCWD && io.cwd)
})), })),
/** /**

View File

@@ -480,11 +480,11 @@ var Option = Class("Option", {
stringlist: function stringlist(k) this.value.indexOf(k) >= 0, stringlist: function stringlist(k) this.value.indexOf(k) >= 0,
get charlist() this.stringlist, get charlist() this.stringlist,
regexplist: function regexplist(k, default_) { regexplist: function regexplist(k, default_=null) {
for (let re in values(this.value)) for (let re in values(this.value))
if ((re.test || re).call(re, k)) if ((re.test || re).call(re, k))
return re.result; return re.result;
return arguments.length > 1 ? default_ : null; return default_;
}, },
get regexpmap() this.regexplist, get regexpmap() this.regexplist,
get sitelist() this.regexplist, get sitelist() this.regexplist,

View File

@@ -588,10 +588,10 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
* @param {string} msg The trace message. * @param {string} msg The trace message.
* @param {number} frames The number of frames to print. * @param {number} frames The number of frames to print.
*/ */
dumpStack: function dumpStack(msg, frames) { dumpStack: function dumpStack(msg="Stack", frames=null) {
let stack = util.stackLines(Error().stack); let stack = util.stackLines(Error().stack);
stack = stack.slice(1, 1 + (frames || stack.length)).join("\n").replace(/^/gm, " "); stack = stack.slice(1, 1 + (frames || stack.length)).join("\n").replace(/^/gm, " ");
util.dump((arguments.length == 0 ? "Stack" : msg) + "\n" + stack + "\n"); util.dump(msg + "\n" + stack + "\n");
}, },
/** /**