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

Replace expression closures (function declarations).

Browse Source 
Expression closures are to be axed. See https://bugzil.la/1083458.
This commit is contained in:
Doug Kearns
2015-05-25 23:59:30 +10:00
parent 5ab1befbf7
commit c0b7c4c35d
31 changed files with 292 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
common/modules/util.jsm
View File

@@ -259,17 +259,19 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
let stack = [frame()];
stack.__defineGetter__("top", function () this[this.length - 1]);
function frame() update(
function _frame(obj)
_frame === stack.top || _frame.valid(obj)
? _frame.elements.map(e => callable(e) ? e(obj) : e)
.join("")
: "",
{
elements: [],
seen: {},
valid: function valid(obj) this.elements.every(e => !e.test || e.test(obj))
});
function frame() {
return update(
function _frame(obj)
_frame === stack.top || _frame.valid(obj)
? _frame.elements.map(e => callable(e) ? e(obj) : e)
.join("")
: "",
{
elements: [],
seen: {},
valid: function valid(obj) this.elements.every(e => !e.test || e.test(obj))
});
}
let end = 0;
for (let match of util.regexp.iterate(/(.*?)%(.)/gy, format)) {
@@ -345,17 +347,19 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
if (!keepUnknown)
unknown = () => "";
function frame() update(
function _frame(obj)
_frame === stack.top || _frame.valid(obj)
? _frame.elements.map(e => callable(e) ? e(obj) : e)
.join("")
: "",
{
elements: [],
seen: new RealSet,
valid: function valid(obj) this.elements.every(e => (!e.test || e.test(obj)))
});
function frame() {
return update(
function _frame(obj)
_frame === stack.top || _frame.valid(obj)
? _frame.elements.map(e => callable(e) ? e(obj) : e)
.join("")
: "",
{
elements: [],
seen: new RealSet,
valid: function valid(obj) this.elements.every(e => (!e.test || e.test(obj)))
});
}
let defaults = { lt: "<", gt: ">" };
@@ -655,8 +659,12 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
* @returns {string}
*/
formatSeconds: function formatSeconds(seconds) {
function pad(n, val) ("0000000" + val).substr(-Math.max(n, String(val).length));
function div(num, denom) [Math.floor(num / denom), Math.round(num % denom)];
function pad(n, val) {
return ("0000000" + val).substr(-Math.max(n, String(val).length));
}
function div(num, denom) {
return [Math.floor(num / denom), Math.round(num % denom)];
}
let days, hours, minutes;
[minutes, seconds] = div(Math.round(seconds), 60);