gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-21 13:17:59 +01:00
Code Issues Projects Releases Wiki Activity

Get rid of most remaining comprehensions.

Browse Source
This commit is contained in:
Kris Maglione
2015-12-20 15:53:43 -08:00
parent 0aba8fb619
commit 916ea412a5
34 changed files with 372 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/Makefile
View File

@@ -174,7 +174,18 @@ xpi: $(CHROME)
$(MAKE_JAR) "$(XPI)" "$(XPI_BASES)" "$(XPI_DIRS)" "$(XPI_TEXTS)" "$(XPI_BINS)" "$(XPI_FILES)" $(MAKE_JAR) "$(XPI)" "$(XPI_BASES)" "$(XPI_DIRS)" "$(XPI_TEXTS)" "$(XPI_BINS)" "$(XPI_FILES)"
rm -r -- $(CHROME) rm -r -- $(CHROME)
@echo "Built XPI: $(XPI)"
@if ! which realpath >/dev/null 2>&1; \
then realpah() { \
local IFS="$$(echo)"; \
local x="$$1"; \
case "$$x" in \
/*) ;; \
*) x=$$(pwd);; \
esac; \
}; \
fi; \
echo "Built XPI: $$(realpath -s -- $(XPI))"
#### jar #### jar

22
common/content/bookmarks.js
View File

@@ -449,13 +449,17 @@ var Bookmarks = Module("bookmarks", {
description: "Bookmark page title or description", description: "Bookmark page title or description",
completer: function title(context, args) { completer: function title(context, args) {
let frames = buffer.allFrames(); let frames = buffer.allFrames();
if (!args.bang) if (!args.bang)
return [ return frames.map(win => [win.document.title,
[win.document.title, frames.length == 1 ? /*L*/"Current Location" : /*L*/"Frame: " + win.location.href] frames.length == 1 ? /*L*/"Current Location"
for (win of frames)]; : /*L*/"Frame: " + win.location.href]);
context.keys.text = "title"; context.keys.text = "title";
context.keys.description = "url"; context.keys.description = "url";
return bookmarks.get(args.join(" "), args["-tags"], null, { keyword: args["-keyword"], title: context.filter }); return bookmarks.get(args.join(" "), args["-tags"], null,
{ keyword: args["-keyword"],
title: context.filter });
}, },
type: CommandOption.STRING type: CommandOption.STRING
}; };
@@ -514,12 +518,14 @@ var Bookmarks = Module("bookmarks", {
if (!args.bang) { if (!args.bang) {
context.title = ["Page URL"]; context.title = ["Page URL"];
let frames = buffer.allFrames(); let frames = buffer.allFrames();
context.completions = [ context.completions = frames.map(win => [win.document.documentURI,
[win.document.documentURI, frames.length == 1 ? /*L*/"Current Location" : /*L*/"Frame: " + win.document.title] frames.length == 1 ? /*L*/"Current Location"
for (win of frames)]; : /*L*/"Frame: " + win.document.title]);
} }
else else
completion.bookmark(context, args["-tags"], { keyword: args["-keyword"], title: args["-title"] }); completion.bookmark(context, args["-tags"],
{ keyword: args["-keyword"],
title: args["-title"] });
}, },
options: [keyword, title, tags, post, options: [keyword, title, tags, post,
{ {

3
common/content/commandline.js
View File

@@ -525,7 +525,8 @@ var CommandLine = Module("commandline", {
if (storage.exists("history-" + name)) { if (storage.exists("history-" + name)) {
let ary = storage.newArray("history-" + name, { store: true, privateData: true }); let ary = storage.newArray("history-" + name, { store: true, privateData: true });
this._store.set(name, [v for ([k, v] of ary)]); this._store.set(name, Array.from(ary, ([key, val]) => val));
ary.delete(); ary.delete();
this._store.changed(); this._store.changed();
} }

55
common/content/dactyl.js
View File

@@ -775,19 +775,34 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
let loadplugins = options.get("loadplugins"); let loadplugins = options.get("loadplugins");
if (args) if (args)
loadplugins = { __proto__: loadplugins, value: args.map(Option.parseRegexp) }; loadplugins = { __proto__: loadplugins,
value: args.map(Option.parseRegexp) };
dir.readDirectory(true).forEach(function (file) { let shouldSource = file => {
if (file.leafName[0] == ".") if (!loadplugins.getKey(file.path))
return false;
if (force)
return true;
if (file.path in dactyl.pluginFiles)
return dactyl.pluginFiles[file.path] < file.lastModifiedTime;
return true;
};
dir.readDirectory(true).forEach(file => {
if (file.leafName.startsWith("."))
; ;
else if (file.isFile() && loadplugins.getKey(file.path) else if (file.isFile()) {
&& !(!force && file.path in dactyl.pluginFiles && dactyl.pluginFiles[file.path] >= file.lastModifiedTime)) { if (shouldSource(file)) {
try { try {
io.source(file.path); io.source(file.path);
dactyl.pluginFiles[file.path] = file.lastModifiedTime; dactyl.pluginFiles[file.path] = file.lastModifiedTime;
} }
catch (e) { catch (e) {
dactyl.reportError(e); dactyl.reportError(e);
}
} }
} }
else if (file.isDirectory()) else if (file.isDirectory())
@@ -804,10 +819,9 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
dactyl.echomsg( dactyl.echomsg(
_("plugin.searchingForIn", _("plugin.searchingForIn",
JSON.stringify("plugins/**/*.{js," + config.fileExtension + "}"), JSON.stringify("plugins/**/*.{js," + config.fileExtension + "}"),
JSON.stringify([dir.path.replace(/.plugins$/, "") JSON.stringify(dirs.map(dir => dir.path.replace(/.plugins$/, ""))
for (dir of dirs)] .join(","))),
.join(","))),
2); 2);
dirs.forEach(function (dir) { dirs.forEach(function (dir) {
@@ -1226,7 +1240,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
* @property {[Window]} Returns an array of all the host application's * @property {[Window]} Returns an array of all the host application's
* open windows. * open windows.
*/ */
get windows() { return [w for (w of overlay.windows)]; } get windows() { return Array.from(overlay.windows); }
}, { }, {
isToolbarHidden: function isToolbarHidden(toolbar) { isToolbarHidden: function isToolbarHidden(toolbar) {
@@ -1399,7 +1413,9 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
N: ["Tab number over icon", highlight.selector("TabIconNumber")] N: ["Tab number over icon", highlight.selector("TabIconNumber")]
}, },
setter: function (opts) { setter: function (opts) {
let classes = [v[1] for ([k, v] of iter(this.opts)) if (opts.indexOf(k) < 0)]; let classes = Object.entries(this.opts)
.filter(([name]) => !opts.includes(name))
.map(([name, data]) => data[1]);
styles.system.add("taboptions", "chrome://*", styles.system.add("taboptions", "chrome://*",
classes.length ? classes.join(",") + "{ display: none; }" : ""); classes.length ? classes.join(",") + "{ display: none; }" : "");
@@ -1876,7 +1892,10 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
completion.dialog = function dialog(context) { completion.dialog = function dialog(context) {
context.title = ["Dialog"]; context.title = ["Dialog"];
context.filters.push(({ item }) => !item[2] || item[2]()); context.filters.push(({ item }) => !item[2] || item[2]());
context.completions = [[k, v[0], v[2]] for ([k, v] of iter(config.dialogs))];
context.completions = (
Object.entries(config.dialogs)
.map(([key, val]) => [k, v[0], v[2]]));
}; };
completion.menuItem = function menuItem(context) { completion.menuItem = function menuItem(context) {

8
common/content/editor.js
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2008-2014 Kris Maglione <maglione.k at Gmail> // Copyright (c) 2008-2015 Kris Maglione <maglione.k at Gmail>
// Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org> // Copyright (c) 2006-2009 by Martin Stubenschrott <stubenschrott@vimperator.org>
// //
// This work is licensed for reuse under an MIT license. Details are // This work is licensed for reuse under an MIT license. Details are
@@ -1399,9 +1399,11 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), {
}, },
validator: function (value) { validator: function (value) {
this.format({}, value); this.format({}, value);
let allowed = new RealSet(["column", "file", "line"]); let allowed = new RealSet(["column", "file", "line"]);
return [k for (k of util.compileMacro(value).seen)] return util.compileMacro(value)
.every(k => allowed.has(k)); .seen.difference(allowed)
.size == 0;
} }
}); });

9
common/content/events.js
View File

@@ -306,9 +306,12 @@ var Events = Module("events", {
* @param {string} filter A regular expression filter string. A null * @param {string} filter A regular expression filter string. A null
* filter selects all macros. * filter selects all macros.
*/ */
getMacros: function (filter) { getMacros: function (filter = null) {
let re = RegExp(filter || ""); let re = RegExp(filter || "");
return ([k, m.text] for ([k, m] of editor.registers) if (re.test(k)));
return Array.from(editor.registers,
([key, macro]) => [key, macro.text])
.filter(([key]) => re.test(key));
}, },
/** /**
@@ -1026,7 +1029,7 @@ var Events = Module("events", {
completion: function initCompletion() { completion: function initCompletion() {
completion.macro = function macro(context) { completion.macro = function macro(context) {
context.title = ["Macro", "Keys"]; context.title = ["Macro", "Keys"];
context.completions = [item for (item of events.getMacros())]; context.completions = Array.from(events.getMacros());
}; };
}, },
mappings: function initMappings() { mappings: function initMappings() {

16
common/content/hints.js
View File

@@ -1090,8 +1090,8 @@ var Hints = Module("hints", {
autocomplete: false, autocomplete: false,
completer: function (context) { completer: function (context) {
context.compare = () => 0; context.compare = () => 0;
context.completions = [[k, v.prompt] context.completions = Object.entries(hints.modes)
for ([k, v] of iter(hints.modes))]; .map(([key, mode]) => [key, mode.prompt]);
}, },
onCancel: mappings.bound.popCommand, onCancel: mappings.bound.popCommand,
onSubmit: function (arg) { onSubmit: function (arg) {
@@ -1234,16 +1234,16 @@ var Hints = Module("hints", {
}), }),
indexOf: function indexOf(dest, src) { indexOf: function indexOf(dest, src) {
let table = this.translitTable; let table = this.translitTable;
var end = dest.length - src.length; let end = dest.length - src.length;
if (src.length == 0) if (src.length == 0)
return 0; return 0;
outer: outer:
for (var i = 0; i <= end; i++) { for (let i = 0; i <= end; i++) {
var j = i; let j = i;
for (var k = 0; k < src.length;) { for (let k = 0; k < src.length;) {
var s = dest[j++]; let s = dest[j++];
s = table[s] || s; s = table[s] || s;
for (var l = 0; l < s.length; l++, k++) { for (let l = 0; l < s.length; l++, k++) {
if (s[l] != src[k]) if (s[l] != src[k])
continue outer; continue outer;
if (k == src.length - 1) if (k == src.length - 1)

19
common/content/history.js
View File

@@ -350,11 +350,20 @@ var History = Module("history", {
}; };
// FIXME: Schema-specific // FIXME: Schema-specific
context.generate = () => [ context.generate = () => {
Array.slice(row.rev_host).reverse().join("").slice(1) // FIXME: Synchronous.
for (row of iter(services.history.DBConnection let statement = services.history.DBConnection
.createStatement("SELECT DISTINCT rev_host FROM moz_places WHERE rev_host IS NOT NULL;"))) .createStatement(`SELECT DISTINCT rev_host FROM moz_places
].slice(2); WHERE rev_host IS NOT NULL;`);
let result = Array.from(iter(statement),
({ rev_host }) => Array.from(rev_host)
.reverse().join("")
.slice(1));
statement.finalize();
return result.slice(2); // Why slice 2?;
};
}; };
completion.history = function _history(context, maxItems, sort) { completion.history = function _history(context, maxItems, sort) {

28
common/content/mappings.js
View File

@@ -746,12 +746,15 @@ var Mappings = Module("mappings", {
return null; return null;
} }
function uniqueModes(modes) { function uniqueModes(modes) {
let chars = [k for ([k, v] of iter(modules.modes.modeChars)) let chars = (
if (v.every(mode => modes.indexOf(mode) >= 0))]; Object.entries(modules.modes.modeChars)
.filter(([char, modes_]) => modes_.every(m => modes.includes(m)))
.map(([char]) => char));
return Ary.uniq(modes.filter(m => chars.indexOf(m.char) < 0) let names = modes.filter(m => !chars.includes(m.char))
.map(m => m.name.toLowerCase()) .map(m => m.name.toLowerCase());
.concat(chars));
return [...new RealSet([...chars, ...names])];
} }
commands.add(["feedkeys", "fk"], commands.add(["feedkeys", "fk"],
@@ -773,7 +776,8 @@ var Mappings = Module("mappings", {
for (let mode of modes.mainModes) for (let mode of modes.mainModes)
if (mode.char && !commands.get(mode.char + "map", true)) if (mode.char && !commands.get(mode.char + "map", true))
addMapCommands(mode.char, addMapCommands(mode.char,
[m.mask for (m of modes.mainModes) if (m.char == mode.char)], modes.mainModes.filter(m => m.char == mode.char)
.map(m => m.mask),
mode.displayName); mode.displayName);
let args = { let args = {
@@ -841,9 +845,11 @@ var Mappings = Module("mappings", {
let prefix = /^[bCmn]$/.test(mode.char) ? "" : mode.char + "_"; let prefix = /^[bCmn]$/.test(mode.char) ? "" : mode.char + "_";
let haveTag = k => hasOwnProp(help.tags, k); let haveTag = k => hasOwnProp(help.tags, k);
return ({ helpTag: prefix + map.name, __proto__: map } return Array.from(self.iterate(args, true))
for (map of self.iterate(args, true)) .filter(map => (map.hive === mappings.builtin ||
if (map.hive === mappings.builtin || haveTag(prefix + map.name))); haveTag(prefix + map.name)))
.map(map => ({ helpTag: prefix + map.name,
__proto__: map }));
}, },
description: "List all " + mode.displayName + " mode mappings along with their short descriptions", description: "List all " + mode.displayName + " mode mappings along with their short descriptions",
index: mode.char + "-map", index: mode.char + "-map",
@@ -870,8 +876,8 @@ var Mappings = Module("mappings", {
[ [
null, null,
function (context, obj, args) { function (context, obj, args) {
return [[m.names, m.description] return Array.from(this.iterate(args[0]),
for (m of this.iterate(args[0]))]; map => [map.names, map.description]);
} }
]); ]);
}, },

22
common/content/marks.js
View File

@@ -274,13 +274,14 @@ var Marks = Module("marks", {
template.tabular( template.tabular(
["Mark", "HPos", "VPos", "File"], ["Mark", "HPos", "VPos", "File"],
["", "text-align: right", "text-align: right", "color: green"], ["", "text-align: right", "text-align: right", "color: green"],
([name, Array.from(marks, ([name, mark]) => [
mark.offset ? Math.round(mark.offset.x) name,
: Math.round(mark.position.x * 100) + "%", mark.offset ? Math.round(mark.offset.x)
mark.offset ? Math.round(mark.offset.y) : Math.round(mark.position.x * 100) + "%",
: Math.round(mark.position.y * 100) + "%", mark.offset ? Math.round(mark.offset.y)
mark.location] : Math.round(mark.position.y * 100) + "%",
for ([name, mark] of marks)))); mark.location,
])));
}, },
_onPageLoad: function _onPageLoad(event) { _onPageLoad: function _onPageLoad(event) {
@@ -399,9 +400,10 @@ var Marks = Module("marks", {
return !host || util.isDomainURL(url, host); return !host || util.isDomainURL(url, host);
} }
function match(marks) { function match(marks) {
return (k return Array.from(marks)
for ([k, v] of iter(marks)) .filter(([name, mark]) => (timespan.contains(marktimestamp) &&
if (timespan.contains(v.timestamp) && matchhost(v.location))); matchhost(marklocation)))
.map(([name]) => name);
} }
for (let [url, local] of marks._localMarks) for (let [url, local] of marks._localMarks)

12
common/content/modes.js
View File

@@ -209,9 +209,9 @@ var Modes = Module("modes", {
get all() { return this._modes.slice(); }, get all() { return this._modes.slice(); },
get mainModes() { get mainModes() {
return (mode return Object.entries(modes._modeMap)
for ([k, mode] of iter(modes._modeMap)) .filter(([name, mode]) => !mode.extended && mode.name == name)
if (!mode.extended && mode.name == k)); .map(([name, mode]) => mode);
}, },
get mainMode() { return this._modeMap[this._main]; }, get mainMode() { return this._modeMap[this._main]; },
@@ -595,9 +595,9 @@ var Modes = Module("modes", {
for (let base of mode.bases) for (let base of mode.bases)
tree[base.name][mode.name] = tree[mode.name]; tree[base.name][mode.name] = tree[mode.name];
let roots = iter([m.name, tree[m.name]] let roots = Ary.toObject(
for (m of list) list.filter(mode => !mode.bases.length)
if (!m.bases.length)).toObject(); .map(mode => [mode.name, tree[mode.name]]));
function rec(obj) { function rec(obj) {
let res = ["ul", { "dactyl:highlight": "Dense" }]; let res = ["ul", { "dactyl:highlight": "Dense" }];

9
common/content/quickmarks.js
View File

@@ -100,7 +100,8 @@ var QuickMarks = Module("quickmarks", {
* @param {string} filter The list of quickmarks to display, e.g. "a-c i O-X". * @param {string} filter The list of quickmarks to display, e.g. "a-c i O-X".
*/ */
list: function list(filter) { list: function list(filter) {
let marks = [k for ([k, v] of this._qmarks)]; let marks = Array.from(this._qmarks, ([k]) => k);
let lowercaseMarks = marks.filter(bind("test", /[a-z]/)).sort(); let lowercaseMarks = marks.filter(bind("test", /[a-z]/)).sort();
let uppercaseMarks = marks.filter(bind("test", /[A-Z]/)).sort(); let uppercaseMarks = marks.filter(bind("test", /[A-Z]/)).sort();
let numberMarks = marks.filter(bind("test", /[0-9]/)).sort(); let numberMarks = marks.filter(bind("test", /[0-9]/)).sort();
@@ -115,8 +116,10 @@ var QuickMarks = Module("quickmarks", {
dactyl.assert(marks.length >= 0, _("quickmark.noMatching", JSON.stringify(filter))); dactyl.assert(marks.length >= 0, _("quickmark.noMatching", JSON.stringify(filter)));
} }
commandline.commandOutput(template.tabular(["QuickMark", "URL"], [], commandline.commandOutput(template.tabular(
([mark, quickmarks._qmarks.get(mark)] for (mark of marks)))); ["QuickMark", "URL"], [],
Array.from(marks,
mark => [mark, quickmarks._qmarks.get(mark)])));
} }
}, { }, {
}, { }, {

9
common/content/tabs.js
View File

@@ -862,7 +862,8 @@ var Tabs = Module("tabs", {
let arg = args[0]; let arg = args[0];
if (tabs.indexFromSpec(arg) == -1) { if (tabs.indexFromSpec(arg) == -1) {
let list = [tab for (tab of tabs.match(args[0], args.count, true))]; let list = Array.from(tabs.match(args[0], args.count, true));
dactyl.assert(list.length, _("error.invalidArgument", arg)); dactyl.assert(list.length, _("error.invalidArgument", arg));
dactyl.assert(list.length == 1, _("buffer.multipleMatching", arg)); dactyl.assert(list.length == 1, _("buffer.multipleMatching", arg));
arg = list[0]; arg = list[0];
@@ -1296,7 +1297,11 @@ var Tabs = Module("tabs", {
]; ];
options.add(["activate", "act"], options.add(["activate", "act"],
"Define when newly created tabs are automatically activated", "Define when newly created tabs are automatically activated",
"stringlist", [g[0] for (g of activateGroups.slice(1)) if (!g[2] || !prefs.get("browser.tabs." + g[2]))].join(","), "stringlist", activateGroups.slice(1)
.filter(g => (!g[2] ||
!prefs.get("browser.tabs." + g[2])))
.map(g => g[0])
.join(","),
{ {
values: activateGroups, values: activateGroups,
has: Option.has.toggleAll, has: Option.has.toggleAll,

44
common/modules/base.jsm
View File

@@ -332,10 +332,16 @@ function* properties(obj, prototypes) {
return false; return false;
}; };
return Ary.uniq([k for (k in obj)].concat( let keys_ = function* (obj) {
Object.getOwnPropertyNames( for (let key in object)
XPCNativeWrapper.unwrap(obj)) yield key;
.filter(filter))); };
return [...new RealSet(
[...keys_(obj),
...Object.getOwnPropertyNames(Cu.waiveXrays(obj))
.filter(filter)])
];
} }
else if (!e.stack) { else if (!e.stack) {
throw Error(e); throw Error(e);
@@ -417,8 +423,11 @@ function keys(obj) {
if (isinstance(obj, ["Map"])) if (isinstance(obj, ["Map"]))
return iter(obj.keys()); return iter(obj.keys());
return iter(k for (k in obj) return iter(function* () {
if (hasOwnProp(obj, k))); for (let k in obj)
if (hasOwnProp(obj, k))
yield k;
}());
} }
/** /**
@@ -433,13 +442,16 @@ function values(obj) {
return iter(obj.values()); return iter(obj.values());
if (isinstance(obj, ["Generator", "Iterator", Iter])) if (isinstance(obj, ["Generator", "Iterator", Iter]))
return iter(k for (k of obj)); return iter(obj);
if (Symbol.iterator in obj) if (Symbol.iterator in obj)
return iter(obj[Symbol.iterator]()); return iter(obj[Symbol.iterator]());
return iter(obj[k] for (k in obj) return iter(function* () {
if (hasOwnProp(obj, k))); for (let k in obj)
if (hasOwnProp(obj, k))
yield obj[k];
}());
} }
var RealSet = Set; var RealSet = Set;
@@ -459,7 +471,7 @@ Object.defineProperty(RealSet.prototype, "difference", {
configurable: true, configurable: true,
writable: true, writable: true,
value: function RealSet_difference(set) { value: function RealSet_difference(set) {
return new RealSet(i for (i of this) if (!set.has(i))); return new RealSet(Array.from(this).filter(i => !set.has(i)));
} }
}); });
@@ -467,7 +479,7 @@ Object.defineProperty(RealSet.prototype, "intersection", {
configurable: true, configurable: true,
writable: true, writable: true,
value: function RealSet_intersection(set) { value: function RealSet_intersection(set) {
return new RealSet(i for (i of this) if (set.has(i))); return new RealSet(Array.from(this).filter(i => set.has(i)));
} }
}); });
@@ -1424,7 +1436,7 @@ var StructBase = Class("StructBase", Array, {
}, },
toObject: function struct_toObject() { toObject: function struct_toObject() {
return iter.toObject([k, this[k]] for (k of keys(this.members))); return Ary.toObject(Object.keys(this.members).map(k => [k, this[k]]));
}, },
toString: function struct_toString() { toString: function struct_toString() {
@@ -1670,8 +1682,10 @@ update(iter, {
return obj; return obj;
}, },
compact: function compact(iter) { compact: function* compact(iter) {
return (item for (item of iter) if (item != null)); for (let item of iter)
if (item != null)
yield item;
}, },
every: function every(iter, pred, self) { every: function every(iter, pred, self) {
@@ -1838,7 +1852,7 @@ function arrayWrap(fn) {
var Ary = Class("Ary", Array, { var Ary = Class("Ary", Array, {
init: function (ary) { init: function (ary) {
if (Symbol.iterator in ary && !isArray(ary)) if (Symbol.iterator in ary && !isArray(ary))
ary = [k for (k of ary)]; ary = Array.from(ary);
return new Proxy(ary, { return new Proxy(ary, {
get: function array_get(target, prop) { get: function array_get(target, prop) {

14
common/modules/buffer.jsm
View File

@@ -1110,10 +1110,10 @@ var Buffer = Module("Buffer", {
let distance = reverse ? rect => -rect.top let distance = reverse ? rect => -rect.top
: rect => rect.top; : rect => rect.top;
let elems = [[e, distance(e.getBoundingClientRect())] let elems = Array.from(path.matcher(this.focusedFrame.document),
for (e of path.matcher(this.focusedFrame.document))] elem => [e, distance(e.getBoundingClientRect())])
.filter(e => e[1] > FUDGE) .filter(([elem, dist]) => dist > FUDGE)
.sort((a, b) => a[1] - b[1]); .sort((a, b) => a[1] - b[1]);
if (offScreen && !reverse) if (offScreen && !reverse)
elems = elems.filter(function (e) { elems = elems.filter(function (e) {
@@ -2156,13 +2156,15 @@ var Buffer = Module("Buffer", {
context.title = ["Stylesheet", "Location"]; context.title = ["Stylesheet", "Location"];
// unify split style sheets // unify split style sheets
let styles = iter([s.title, []] for (s of buffer.alternateStyleSheets)).toObject(); let styles = Ary.toObject(buffer.alternateStyleSheets
.map(sheet => [sheet.title, []]));
buffer.alternateStyleSheets.forEach(function (style) { buffer.alternateStyleSheets.forEach(function (style) {
styles[style.title].push(style.href || _("style.inline")); styles[style.title].push(style.href || _("style.inline"));
}); });
context.completions = [[title, href.join(", ")] for ([title, href] of iter(styles))]; context.completions = Object.entries(styles)
.map(([title, href]) => [title, href.join(", ")]);
}; };
completion.savePage = function savePage(context, node) { completion.savePage = function savePage(context, node) {

22
common/modules/commands.jsm
View File

@@ -798,7 +798,7 @@ var Commands = Module("commands", {
let lines = string.split(/\r\n|[\r\n]/); let lines = string.split(/\r\n|[\r\n]/);
let startLine = context.line; let startLine = context.line;
for (var i = 0; i < lines.length && !context.finished; i++) { for (let i = 0; i < lines.length && !context.finished; i++) {
// Deal with editors from Silly OSs. // Deal with editors from Silly OSs.
let line = lines[i].replace(/\r$/, ""); let line = lines[i].replace(/\r$/, "");
@@ -834,10 +834,13 @@ var Commands = Module("commands", {
list: function list(filter, hives) { list: function list(filter, hives) {
const { commandline, completion } = this.modules; const { commandline, completion } = this.modules;
function completerToString(completer) { function completerToString(completer) {
if (completer) if (completer) {
return [k for (let [key, val] of Object.entries(config.completers))
for ([k, v] of iter(config.completers)) if (completion.bound(val) === completer)
if (completer == completion.bound[v])][0] || "custom"; return key;
return "custom";
}
return ""; return "";
} }
@@ -1567,6 +1570,7 @@ var Commands = Module("commands", {
for (var [command, args] of commands.parseCommands(context.filter, context)) for (var [command, args] of commands.parseCommands(context.filter, context))
if (args.trailing) if (args.trailing)
context.advance(args.commandString.length + 1); context.advance(args.commandString.length + 1);
if (!args) if (!args)
args = { commandString: context.filter }; args = { commandString: context.filter };
@@ -1749,7 +1753,8 @@ var Commands = Module("commands", {
names: ["-complete", "-C"], names: ["-complete", "-C"],
description: "The argument completion function", description: "The argument completion function",
completer: function (context) { completer: function (context) {
return [[k, ""] for ([k, v] of iter(config.completers))]; return Object.entries(config.completers)
.map(([k, v]) => [k, ""]);
}, },
type: CommandOption.STRING, type: CommandOption.STRING,
validator: function (arg) { validator: function (arg) {
@@ -1906,12 +1911,11 @@ var Commands = Module("commands", {
setCompleter([CommandHive.prototype.get, setCompleter([CommandHive.prototype.get,
CommandHive.prototype.remove], CommandHive.prototype.remove],
[function () { [function () {
return [[c.names, c.description] for (c of this)]; return Array.from(this, cmd => [c.names, c.description]);
}]); }]);
setCompleter([Commands.prototype.get], setCompleter([Commands.prototype.get],
[function () { [function () {
return [[c.names, c.description] return Array.from(this.iterator(), cmd => [c.names, c.description]);
for (c of this.iterator())];
}]); }]);
}, },
mappings: function initMappings(dactyl, modules, window) { mappings: function initMappings(dactyl, modules, window) {

27
common/modules/completion.jsm
View File

@@ -354,9 +354,11 @@ var CompletionContext = Class("CompletionContext", {
set completions(items) { set completions(items) {
if (items && isArray(items.array)) if (items && isArray(items.array))
items = items.array; items = items.array;
// Accept a generator // Accept a generator
if (!isArray(items)) if (!isArray(items))
items = [x for (x of iter(items || []))]; items = Array.from(items || []);
if (this._completions !== items) { if (this._completions !== items) {
delete this.cache.filtered; delete this.cache.filtered;
delete this.cache.filter; delete this.cache.filter;
@@ -795,7 +797,7 @@ var CompletionContext = Class("CompletionContext", {
let res = completer.apply(self || this, [context].concat(args)); let res = completer.apply(self || this, [context].concat(args));
if (res && !isArray(res) && !isArray(res.__proto__)) if (res && !isArray(res) && !isArray(res.__proto__))
res = [k for (k of res)]; res = Array.from(res);
if (res) if (res)
context.completions = res; context.completions = res;
@@ -1073,9 +1075,9 @@ var Completion = Module("completion", {
context.fork("about", 6, this, function fork_(context) { context.fork("about", 6, this, function fork_(context) {
context.title = ["about:"]; context.title = ["about:"];
context.generate = function generate_() { context.generate = function generate_() {
return [[k.substr(services.ABOUT.length), ""] return Object.keys(Cc).filter(k => k.startsWith(services.ABOUT))
for (k in Cc) .map(k => [k.substr(services.ABOUT.length),
if (k.startsWith(services.ABOUT))]; ""]);
}; };
}); });
@@ -1151,10 +1153,11 @@ var Completion = Module("completion", {
running[provider] = null; running[provider] = null;
context.incomplete = result.searchResult >= result.RESULT_NOMATCH_ONGOING; context.incomplete = result.searchResult >= result.RESULT_NOMATCH_ONGOING;
context.completions = [ context.completions = Array.from(
{ url: result.getValueAt(i), title: result.getCommentAt(i), icon: result.getImageAt(i) } util.range(0, result.matchCount),
for (i of util.range(0, result.matchCount)) i => ({ url: result.getValueAt(i),
]; title: result.getCommentAt(i),
icon: result.getImageAt(i) }));
}), }),
get onUpdateSearchResult() { return this.onSearchResult; } get onUpdateSearchResult() { return this.onSearchResult; }
}); });
@@ -1255,7 +1258,11 @@ var Completion = Module("completion", {
completer: function (context) { completer: function (context) {
let PREFIX = "/ex/contexts"; let PREFIX = "/ex/contexts";
context.fork("ex", 0, completion, "ex"); context.fork("ex", 0, completion, "ex");
completion.contextList = [[k.substr(PREFIX.length), v.title[0]] for ([k, v] of iter(context.contexts)) if (k.substr(0, PREFIX.length) == PREFIX)];
completion.contextList = (
Object.entries(context.contexts)
.filter(([k]) => k.substr(0, PREFIX.length) == PREFIX)
.map(([k, v]) => [k.substr(PREFIX.length), v.title[0]]));
}, },
literal: 0 literal: 0
}); });

36
common/modules/contexts.jsm
View File

@@ -215,12 +215,11 @@ var Contexts = Module("contexts", {
memoize(contexts.hives, name, memoize(contexts.hives, name,
() => Object.create( () => Object.create(
Object.create(contexts.hiveProto, Object.create(contexts.hiveProto,
{ _hive: { value: name } }))); { _hive: { value: name } })));
memoize(contexts.groupsProto, name, function () { memoize(contexts.groupsProto, name, function () {
return [group[name] return this.groups.filter(group => hasOwnProp(group, name))
for (group of values(this.groups)) .map(group => group[name]);
if (hasOwnProp(group, name))];
}); });
}, },
@@ -728,24 +727,25 @@ var Contexts = Module("contexts", {
], ],
serialGroup: 20, serialGroup: 20,
serialize: function () { serialize: function () {
return [ return contexts.initializedGroups()
{ .filter(group => !group.builtin && group.persist)
.map(group => ({
command: this.name, command: this.name,
bang: true, bang: true,
options: iter([v, typeof group[k] == "boolean" ? null : group[k]] options: Ary.toObject(
// FIXME: this map is expressed multiple times Object.entries({
for ([k, v] of iter({ args: "-args",
args: "-args", description: "-description",
description: "-description", filter: "-locations"
filter: "-locations" })
})) .filter(([k]) => group[k])
if (group[k])).toObject(), .map(([k, v]) => [v,
typeof group[k] == "boolean" ? null : group[k]])
),
arguments: [group.name], arguments: [group.name],
ignoreDefaults: true ignoreDefaults: true
} }))
for (group of contexts.initializedGroups()) .concat([{ command: this.name, arguments: ["user"] }]);
if (!group.builtin && group.persist)
].concat([{ command: this.name, arguments: ["user"] }]);
} }
}); });

23
common/modules/dom.jsm
View File

@@ -671,9 +671,13 @@ var DOM = Class("DOM", {
["span", { highlight: "HtmlTagEnd" }, "<", namespaced(elem), ">"]] ["span", { highlight: "HtmlTagEnd" }, "<", namespaced(elem), ">"]]
]); ]);
else { else {
let tag = "<" + [namespaced(elem)].concat( let escape = val => val.replace(/["<]/g, DOM.escapeHTML);
[namespaced(a) + '="' + String.replace(a.value, /["<]/, DOM.escapeHTML) + '"'
for (a of elem.attributes)]).join(" "); let tag = "<" + [
namespaced(elem),
...Array.from(elem.attributes,
attr => `${namespaced(attr)}="${escape(attr.value)}"`),
].join(" ");
res.push(tag + (!hasChildren ? "/>" : ">...</" + namespaced(elem) + ">")); res.push(tag + (!hasChildren ? "/>" : ">...</" + namespaced(elem) + ">"));
} }
@@ -1076,10 +1080,10 @@ var DOM = Class("DOM", {
let params = DEFAULTS[t || "HTML"]; let params = DEFAULTS[t || "HTML"];
let args = Object.keys(params); let args = Object.keys(params);
update(params, this.constructor.defaults[type], update(params, this.constructor.defaults[type],
iter.toObject([k, opts[k]] Ary.toObject(Object.entries(opts)
for (k in opts) .filter(([k]) => k in params)));
if (k in params)));
apply(evt, "init" + t + "Event", args.map(arg => params[arg])); apply(evt, "init" + t + "Event", args.map(arg => params[arg]));
return evt; return evt;
@@ -1672,7 +1676,7 @@ var DOM = Class("DOM", {
} }
// FIXME: Surely we can do better. // FIXME: Surely we can do better.
for (var key in attr) { for (let key in attr) {
if (/^xmlns(?:$|:)/.test(key)) { if (/^xmlns(?:$|:)/.test(key)) {
if (_namespaces === namespaces) if (_namespaces === namespaces)
namespaces = Object.create(namespaces); namespaces = Object.create(namespaces);
@@ -1685,7 +1689,7 @@ var DOM = Class("DOM", {
var elem = doc.createElementNS(vals[0] || namespaces[""], var elem = doc.createElementNS(vals[0] || namespaces[""],
name); name);
for (var key in attr) for (let key in attr)
if (!/^xmlns(?:$|:)/.test(key)) { if (!/^xmlns(?:$|:)/.test(key)) {
var val = attr[key]; var val = attr[key];
if (nodes && key == "key") if (nodes && key == "key")
@@ -1699,6 +1703,7 @@ var DOM = Class("DOM", {
else else
elem.setAttributeNS(vals[0] || "", key, val); elem.setAttributeNS(vals[0] || "", key, val);
} }
args.forEach(function (e) { args.forEach(function (e) {
elem.appendChild(tag(e, namespaces)); elem.appendChild(tag(e, namespaces));
}); });
@@ -1825,7 +1830,7 @@ var DOM = Class("DOM", {
// FIXME: Surely we can do better. // FIXME: Surely we can do better.
let skipAttr = {}; let skipAttr = {};
for (var key in attr) { for (let key in attr) {
if (/^xmlns(?:$|:)/.test(key)) { if (/^xmlns(?:$|:)/.test(key)) {
if (_namespaces === namespaces) if (_namespaces === namespaces)
namespaces = update({}, namespaces); namespaces = update({}, namespaces);

8
common/modules/downloads.jsm
View File

@@ -18,10 +18,10 @@ lazyRequire("resource://gre/modules/DownloadUtils.jsm", ["DownloadUtils"]);
var MAX_LOAD_TIME = 10 * 1000; var MAX_LOAD_TIME = 10 * 1000;
let prefix = "DOWNLOAD_"; let prefix = "DOWNLOAD_";
var states = iter([v, k.slice(prefix.length).toLowerCase()] var states = Ary.toObject(
for ([k, v] of iter(Ci.nsIDownloadManager)) Object.entries(Ci.nsIDownloadManager).filter(([key]) => key.startsWith(prefix))
if (k.startsWith(prefix))) .map(([key, val]) => [val,
.toObject(); key.slice(prefix.length).toLowerCase()]));
var Download = Class("Download", { var Download = Class("Download", {
init: function init(download, list) { init: function init(download, list) {

22
common/modules/help.jsm
View File

@@ -301,21 +301,21 @@ var Help = Module("Help", {
dactyl.initHelp(); dactyl.initHelp();
if (FILE.isDirectory()) { if (FILE.isDirectory()) {
var addDataEntry = function addDataEntry(file, data) { var addDataEntry = (file, data) => {
FILE.child(file).write(data); FILE.child(file).write(data);
}; };
var addURIEntry = function addURIEntry(file, uri) { var addURIEntry = (file, uri) => {
addDataEntry(file, util.httpGet(uri).responseText); addDataEntry(file, util.httpGet(uri).responseText);
}; };
} }
else { else {
var zip = services.ZipWriter(FILE.file, File.MODE_CREATE | File.MODE_WRONLY | File.MODE_TRUNCATE); var zip = services.ZipWriter(FILE.file, File.MODE_CREATE | File.MODE_WRONLY | File.MODE_TRUNCATE);
addURIEntry = function addURIEntry(file, uri) { addURIEntry = (file, uri) => {
zip.addEntryChannel(PATH + file, TIME, 9, zip.addEntryChannel(PATH + file, TIME, 9,
services.io.newChannel(uri, null, null), false); services.io.newChannel(uri, null, null), false);
}; };
addDataEntry = function addDataEntry(file, data) {// Unideal to an extreme. addDataEntry = (file, data) => {// Unideal to an extreme.
addURIEntry(file, "data:text/plain;charset=UTF-8," + encodeURI(data)); addURIEntry(file, "data:text/plain;charset=UTF-8," + encodeURI(data));
}; };
} }
@@ -396,12 +396,14 @@ var Help = Module("Help", {
addDataEntry(file + ".xhtml", data.join("")); addDataEntry(file + ".xhtml", data.join(""));
} }
data = [h for (h of highlight) data = Array.from(highlight)
if (styles.has(h.class) || /^Help/.test(h.class))] .filter(h => styles.has(h.class) || /^Help/.test(h.class))
.map(h => h.selector .map(h => (h.selector
.replace(/^\[.*?=(.*?)\]/, ".hl-$1") .replace(/^\[.*?=(.*?)\]/, ".hl-$1")
.replace(/html\|/g, "") + "\t" + "{" + h.cssText + "}") .replace(/html\|/g, "") +
.join("\n"); "\t" + "{" + h.cssText + "}"))
.join("\n");
addDataEntry("help.css", data.replace(/chrome:[^ ")]+\//g, "")); addDataEntry("help.css", data.replace(/chrome:[^ ")]+\//g, ""));
addDataEntry("tag-map.json", JSON.stringify(help.tags)); addDataEntry("tag-map.json", JSON.stringify(help.tags));

29
common/modules/highlight.jsm
View File

@@ -99,8 +99,8 @@ update(Highlight.prototype, {
toString: function () { toString: function () {
return "Highlight(" + this.class + ")\n\t" + return "Highlight(" + this.class + ")\n\t" +
[k + ": " + JSON.stringify(String(v)) Array.from(this, ([k, v]) => `${k}: ${JSON.stringify(String(v))}`)
for ([k, v] of this)].join("\n\t"); .join("\n\t")
} }
}); });
@@ -431,18 +431,16 @@ var Highlights = Module("Highlight", {
} }
], ],
serialize: function () { serialize: function () {
return [ return Array.from(highlight)
{ .filter(v => v.value != v.defaultValue)
command: this.name, .map(v => ({
arguments: [v.class], command: this.name,
literalArg: v.value, arguments: [v.class],
options: { literalArg: v.value,
"-link": v.extends.length ? v.extends : undefined options: {
} "-link": v.extends.length ? v.extends : undefined
} }
for (v of highlight) }));
if (v.value != v.defaultValue)
];
} }
}); });
}, },
@@ -468,7 +466,8 @@ var Highlights = Module("Highlight", {
completion.highlightGroup = function highlightGroup(context) { completion.highlightGroup = function highlightGroup(context) {
context.title = ["Highlight Group", "Value"]; context.title = ["Highlight Group", "Value"];
context.completions = [[v.class, v.value] for (v of highlight)]; context.completions = Array.from(highlight,
v => [v.class, v.value]);
}; };
}, },
javascript: function initJavascript(dactyl, modules, window) { javascript: function initJavascript(dactyl, modules, window) {

10
common/modules/io.jsm
View File

@@ -221,9 +221,8 @@ var IO = Module("io", {
charsets: Class.Memoize(function () { charsets: Class.Memoize(function () {
const BASE = "@mozilla.org/intl/unicode/decoder;1?charset="; const BASE = "@mozilla.org/intl/unicode/decoder;1?charset=";
return [k.slice(BASE.length) return Object.keys(Cc).filter(k.startsWith(BASE))
for (k of Object.keys(Cc)) .map(k => k.slice(BASE.length));
if (k.startsWith(BASE))];
}), }),
charsetBundle: Class.Memoize( charsetBundle: Class.Memoize(
@@ -930,13 +929,14 @@ unlet s:cpo_save
commands.add(["scrip[tnames]"], commands.add(["scrip[tnames]"],
"List all sourced script names", "List all sourced script names",
function () { function () {
let names = [k for (k of io._scriptNames)]; let names = Array.from(io._scriptNames);
if (!names.length) if (!names.length)
dactyl.echomsg(_("command.scriptnames.none")); dactyl.echomsg(_("command.scriptnames.none"));
else else
modules.commandline.commandOutput( modules.commandline.commandOutput(
template.tabular(["<SNR>", "Filename"], ["text-align: right; padding-right: 1em;"], template.tabular(["<SNR>", "Filename"], ["text-align: right; padding-right: 1em;"],
([i + 1, file] for ([i, file] of iter(names))))); Array.from(names.entries(),
([i, file]) => [i + 1, file])));
}, },
{ argCount: "0" }); { argCount: "0" });

4
common/modules/javascript.jsm
View File

@@ -660,8 +660,8 @@ var JavaScript = Module("javascript", {
"encodeURI", "encodeURIComponent", "escape", "eval", "isFinite", "isNaN", "encodeURI", "encodeURIComponent", "escape", "eval", "isFinite", "isNaN",
"isXMLName", "parseFloat", "parseInt", "undefined", "unescape", "uneval", "isXMLName", "parseFloat", "parseInt", "undefined", "unescape", "uneval",
...interfaces.filter(key => /^nsIDOM/.test(key)).map(key => k.substr(6)), ...interfaces.filter(key => /^nsIDOM/.test(key)).map(key => key.substr(6)),
...interfaces.filter(key => /^nsI/.test(key)).map(key => k.substr(3)), ...interfaces.filter(key => /^nsI/.test(key)).map(key => key.substr(3)),
...this.magicalNames, ...this.magicalNames,
]); ]);

19
common/modules/options.jsm
View File

@@ -832,8 +832,7 @@ var Option = Class("Option", {
if (isArray(acceptable)) if (isArray(acceptable))
acceptable = new RealSet(acceptable.map(v => v[0])); acceptable = new RealSet(acceptable.map(v => v[0]));
else else
acceptable = new RealSet(this.parseKey(k) acceptable = new RealSet(Object.keys(acceptable).map(k => this.parseKey(k)));
for (k of Object.keys(acceptable)));
if (this.type === "regexpmap" || this.type === "sitemap") if (this.type === "regexpmap" || this.type === "sitemap")
return Array.concat(vals).every(re => acceptable.has(re.result)); return Array.concat(vals).every(re => acceptable.has(re.result));
@@ -1483,15 +1482,16 @@ var Options = Module("options", {
modifiers: {}, modifiers: {},
extra: { extra: {
serialize: function () { serialize: function () {
return [ return Array.from(modules.options)
{ .filter(opt => (!opt.getter &&
!opt.isDefault &&
(opt.scope & Option.SCOPE_GLOBAL)))
.map(
opt => ({
command: this.name, command: this.name,
literalArg: [opt.type == "boolean" ? (opt.value ? "" : "no") + opt.name literalArg: [opt.type == "boolean" ? (opt.value ? "" : "no") + opt.name
: opt.name + "=" + opt.stringValue] : opt.name + "=" + opt.stringValue]
} }));
for (opt of modules.options)
if (!opt.getter && !opt.isDefault && (opt.scope & Option.SCOPE_GLOBAL))
];
} }
} }
} }
@@ -1661,7 +1661,8 @@ var Options = Module("options", {
}, },
javascript: function initJavascript(dactyl, modules, window) { javascript: function initJavascript(dactyl, modules, window) {
const { options, JavaScript } = modules; const { options, JavaScript } = modules;
JavaScript.setCompleter(Options.prototype.get, [() => ([o.name, o.description] for (o of options))]); JavaScript.setCompleter(Options.prototype.get, [() => Array.from(options,
opt => [opt.name, opt.description])]);
}, },
sanitizer: function initSanitizer(dactyl, modules, window) { sanitizer: function initSanitizer(dactyl, modules, window) {
const { sanitizer } = modules; const { sanitizer } = modules;

8
common/modules/overlay.jsm
View File

@@ -296,10 +296,8 @@ var Overlay = Module("Overlay", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReferen
function insert(key, fn) { function insert(key, fn) {
if (obj[key]) { if (obj[key]) {
let iterator = iter(obj[key]); let iterator = iter(obj[key]);
if (isArray(obj[key])) { if (isArray(obj[key]))
iterator = ([elem[1].id, elem.slice(2), elem[1]] iterator = obj[key].map(elem => [elem[1].id, elem.slice(2), elem[1]]);
for (elem of obj[key]));
}
for (let [elem, xml, attrs] of iterator) { for (let [elem, xml, attrs] of iterator) {
if (elem = doc.getElementById(String(elem))) { if (elem = doc.getElementById(String(elem))) {
@@ -479,7 +477,7 @@ var Overlay = Module("Overlay", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReferen
return this.activeWindow && this.activeWindow.dactyl.modules; return this.activeWindow && this.activeWindow.dactyl.modules;
}, },
get modules() { return [w.dactyl.modules for (w of this.windows)]; }, get modules() { return Array.from(this.windows, win => win.dactyl.modules) },
/** /**
* The most recently active dactyl window. * The most recently active dactyl window.

47
common/modules/sanitizer.jsm
View File

@@ -186,10 +186,10 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
}); });
function ourItems(persistent) { function ourItems(persistent) {
return [ return Object.values(self.itemMap)
item for (item of values(self.itemMap)) .filter(item => (!item.builtin &&
if (!item.builtin && (!persistent || item.persistent) && item.name !== "all") (!persistent || item.persistent) &&
]; item.name !== "all"));
} }
function prefOverlay(branch, persistent, local) { function prefOverlay(branch, persistent, local) {
@@ -261,13 +261,15 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
elem.setAttribute("rows", elem.itemCount); elem.setAttribute("rows", elem.itemCount);
win.Sanitizer = Class("Sanitizer", win.Sanitizer, { win.Sanitizer = Class("Sanitizer", win.Sanitizer, {
sanitize: function sanitize() { sanitize: function sanitize() {
self.withSavedValues(["sanitizing"], function () { self.withSavedValues(["sanitizing"], () => {
self.sanitizing = true; self.sanitizing = true;
sanitize.superapply(this, arguments); sanitize.superapply(this, arguments);
sanitizer.sanitizeItems([item.name for (item of values(self.itemMap)) sanitizer.sanitizeItems(
if (item.shouldSanitize(false))], Object.values(self.itemMap)
Range.fromArray(this.range || [])); .filter(item => item.shouldSanitize(false))
}, this); .map(item => item.name),
Range.fromArray(this.range || []));
});
} }
}); });
} }
@@ -601,13 +603,15 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
modules.commandline.commandOutput(template.tabular( modules.commandline.commandOutput(template.tabular(
["Host", "Expiry (UTC)", "Path", "Name", "Value"], ["Host", "Expiry (UTC)", "Path", "Name", "Value"],
["padding-right: 1em", "padding-right: 1em", "padding-right: 1em", "max-width: 12em; overflow: hidden;", "padding-left: 1ex;"], ["padding-right: 1em", "padding-right: 1em", "padding-right: 1em", "max-width: 12em; overflow: hidden;", "padding-left: 1ex;"],
([c.host, Array.from(Sanitizer.iterCookies(host),
c.isSession ? ["span", { highlight: "Enabled" }, "session"] c => [
: (new Date(c.expiry * 1000).toJSON() || "Never").replace(/:\d\d\.000Z/, "").replace("T", " ").replace(/-/g, "/"), c.host,
c.path, c.isSession ? ["span", { highlight: "Enabled" }, "session"]
c.name, : (new Date(c.expiry * 1000).toJSON() || "Never").replace(/:\d\d\.000Z/, "").replace("T", " ").replace(/-/g, "/"),
c.value] c.path,
for (c of Sanitizer.iterCookies(host))))); c.name,
c.value,
])));
return; return;
default: default:
util.assert(cmd in Sanitizer.PERMS, _("error.invalidArgument")); util.assert(cmd in Sanitizer.PERMS, _("error.invalidArgument"));
@@ -680,17 +684,16 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
{ {
initialValue: true, initialValue: true,
get values() { get values() {
return [i return Object.values(sanitizer.itemMap)
for (i of values(sanitizer.itemMap)) .filter(i => i.persistent || i.builtin);
if (i.persistent || i.builtin)];
}, },
getter: function () { getter: function () {
if (!sanitizer.runAtShutdown) if (!sanitizer.runAtShutdown)
return []; return [];
else else
return [item.name return Object.values(sanitizer.itemMap)
for (item of values(sanitizer.itemMap)) .filter(item => item.shouldSanitize(true))
if (item.shouldSanitize(true))]; .map(item => item.name);
}, },
setter: function (value) { setter: function (value) {
if (value.length === 0) if (value.length === 0)

20
common/modules/services.jsm
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2008-2014 Kris Maglione <maglione.k at Gmail> // Copyright (c) 2008-2015 Kris Maglione <maglione.k at Gmail>
// //
// This work is licensed for reuse under an MIT license. Details are // This work is licensed for reuse under an MIT license. Details are
// given in the LICENSE.txt file included with this file. // given in the LICENSE.txt file included with this file.
@@ -175,17 +175,23 @@ var Services = Module("Services", {
* @param {string} init Name of a property or method used to initialize the * @param {string} init Name of a property or method used to initialize the
* class. * class.
*/ */
addClass: function addClass(name, class_, ifaces, init, quiet) { addClass: function addClass(name, class_, ifaces, init = null, quiet = false) {
this.services[name] = { class: class_, interfaces: Array.concat(ifaces || []), method: "createInstance", init: init, quiet: quiet }; this.services[name] = { class: class_,
interfaces: Array.concat(ifaces || []),
method: "createInstance",
init: init,
quiet: quiet };
if (init) if (init)
memoize(this.services[name], "callable", function () { memoize(this.services[name], "callable", function () {
return callable(XPCOMShim(this.interfaces)[this.init]); return callable(XPCOMShim(this.interfaces)[this.init]);
}); });
this[name] = (function Create() { this[name] = (...args) => this._create(name, args);
return this._create(name, arguments);
}).bind(this); update(this[name],
update.apply(null, [this[name]].concat([Ci[i] for (i of Array.concat(ifaces))])); ...Array.concat(ifaces).map(iface => Ci[iface]));
return this[name]; return this[name];
}, },

2
common/modules/storage.jsm
View File

@@ -550,7 +550,7 @@ var File = Class("File", {
if (!this.isDirectory()) if (!this.isDirectory())
throw Error(_("io.eNotDir")); throw Error(_("io.eNotDir"));
let array = [e for (e of this.iterDirectory())]; let array = Array.from(this.iterDirectory());
if (sort) if (sort)
array.sort((a, b) => (b.isDirectory() - a.isDirectory() || array.sort((a, b) => (b.isDirectory() - a.isDirectory() ||
String.localeCompare(a.path, b.path))); String.localeCompare(a.path, b.path)));

2
common/modules/styles.jsm
View File

@@ -196,7 +196,7 @@ var Hive = Class("Hive", {
*/ */
find: function find(name, filter, css, index) { find: function find(name, filter, css, index) {
// Grossly inefficient. // Grossly inefficient.
let matches = [k for ([k, v] of iter(this.sheets))]; let matches = Object.keys(this.sheets);
if (index) if (index)
matches = String(index).split(",").filter(i => i in this.sheets); matches = String(index).split(",").filter(i => i in this.sheets);
if (name) if (name)

26
common/modules/util.jsm
View File

@@ -818,8 +818,9 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
} }
if (isObject(params.params)) { if (isObject(params.params)) {
let data = [encodeURIComponent(k) + "=" + encodeURIComponent(v) let encode = ([key, val]) => `${encodeURIComponent(key)}=${encodeURIComponent(val)}`;
for ([k, v] of iter(params.params))]; let data = Object.entries(params).map(encode);
let uri = util.newURI(url); let uri = util.newURI(url);
uri.query += (uri.query ? "&" : "") + data.join("&"); uri.query += (uri.query ? "&" : "") + data.join("&");
@@ -1307,8 +1308,14 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
* @returns {RegExp} A custom regexp object. * @returns {RegExp} A custom regexp object.
*/ */
regexp: update(function (expr, flags, tokens) { regexp: update(function (expr, flags, tokens) {
flags = flags || [k for ([k, v] of iter({ g: "global", i: "ignorecase", m: "multiline", y: "sticky" })) if (!flags)
if (expr[v])].join(""); flags = Object.entries({ g: "global",
i: "ignorecase",
m: "multiline",
y: "sticky" })
.filter(([short, full]) => expr[full])
.map(([short]) => short)
.join("");
if (isinstance(expr, ["RegExp"])) if (isinstance(expr, ["RegExp"]))
expr = expr.source; expr = expr.source;
@@ -1472,7 +1479,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
this.errors.push([new Date, obj + "\n" + obj.stack]); this.errors.push([new Date, obj + "\n" + obj.stack]);
this.errors = this.errors.slice(-this.maxErrors); this.errors = this.errors.slice(-this.maxErrors);
this.errors.toString = function () { this.errors.toString = function () {
return [k + "\n" + v for ([k, v] of this)].join("\n\n"); return this.map(([name, stack]) => `${name}\n${stack}\n`)
.join("\n");
}; };
this.dump(String(error)); this.dump(String(error));
@@ -1510,9 +1518,11 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
} }
catch (e) {} catch (e) {}
let ary = host.split("."); let parts = host.split(".");
ary = [ary.slice(i).join(".") for (i of util.range(ary.length, 0, -1))];
return ary.filter(h => h.length >= base.length); return Array.from(util.range(parts.length, 0, -1),
i => parts.slice(i).join("."))
.filter(host => host.length >= base.length);
}, },
/** /**

6
plugins/aardvark.js
View File

@@ -1153,13 +1153,13 @@ var Aardvark = Class("Aardvark", {
// valid selectable element // valid selectable element
findValidElement: function findValidElement(elem) { findValidElement: function findValidElement(elem) {
for (; elem; elem = elem.parentNode) { for (; elem; elem = elem.parentNode) {
if (Set.has(this.alwaysValidElements, elem.localName)) if (hasOwnProperty(this.alwaysValidElements, elem.localName))
break; break;
let { display } = DOM(elem).style; let { display } = DOM(elem).style;
if (Set.has(this.validIfBlockElements, elem.localName) && display == "block") if (hasOwnProperty(this.validIfBlockElements, elem.localName) && display == "block")
break; break;
if (Set.has(this.validIfNotInlineElements, elem.localName) && display != "inline") if (hasOwnProperty(this.validIfNotInlineElements, elem.localName) && display != "inline")
break; break;
} }
return elem; return elem;

2
plugins/flashblock.js
View File

@@ -404,7 +404,7 @@ var CSS =
* *
* Change XBL binding for <object> tags, click to view flash * Change XBL binding for <object> tags, click to view flash
*/ */
String.literal` String.raw`
pseudoembed { pseudoembed {
display: inline-block; display: inline-block;

32
plugins/http-headers.js
View File

@@ -31,6 +31,9 @@ var Controller = Class("Controller", XPCOM(Ci.nsIController), {
supportsCommand: function (cmd) { return cmd === this.command; }, supportsCommand: function (cmd) { return cmd === this.command; },
}); });
var winMap = new WeakMap();
var docMap = new WeakMap();
var HttpObserver = Class("HttpObserver", var HttpObserver = Class("HttpObserver",
XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference, Ci.nsIWebProgressListener]), { XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference, Ci.nsIWebProgressListener]), {
@@ -58,7 +61,11 @@ var HttpObserver = Class("HttpObserver",
getHeaders: function getHeaders(win, request) { getHeaders: function getHeaders(win, request) {
request.QueryInterface(Ci.nsIChannel); request.QueryInterface(Ci.nsIChannel);
let headers = overlay.getData(win.document, "headers", Object); let doc = win.document;
let data = docMap.get(doc);
let headers = data && data.headers || {};
if ("response" in headers) if ("response" in headers)
return; return;
@@ -81,10 +88,9 @@ var HttpObserver = Class("HttpObserver",
} }
catch (e) {} catch (e) {}
let controller = this.getController(win); let data = { headers: headers, url: doc.documentURI };
if (controller) winMap.set(win, data);
win.controllers.removeController(controller); docMap.set(doc, data);
win.controllers.appendController(Controller("dactyl-headers", { headers: headers, url: win.document.documentURI }));
} }
}, },
@@ -118,27 +124,19 @@ var HttpObserver = Class("HttpObserver",
} catch (e) {} } catch (e) {}
} }
}), }),
getController: function getController(win) {
for (let i of util.range(0, win.controllers.getControllerCount())) {
let controller = win.controllers.getControllerAt(i);
if (controller.supportsCommand("dactyl-headers") && controller.wrappedJSObject instanceof Controller)
return controller.wrappedJSObject;
}
}
}); });
let observer = HttpObserver(); let observer = HttpObserver();
let onUnload = observer.closure.cleanup; let onUnload = observer.bound.cleanup;
function* iterHeaders(buffer, type) { function* iterHeaders(buffer, type) {
let win = buffer.focusedFrame; let win = buffer.focusedFrame;
let store = win.document[overlay.id]; let store = docMap.get(win.document);
if (!store || !store.headers) if (!store || !store.headers)
store = observer.getController(win); store = winMap.get(win);
if (store) if (store)
for (let [k, v] of values(store.headers[type] || [])) for (let [k, v] of (store.headers[type] || []))
yield [k, v]; yield [k, v];
} }