gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-23 15:15:46 +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

23
common/modules/dom.jsm
View File

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