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

Fix brokenness.

Browse Source
This commit is contained in:
Kris Maglione
2015-02-22 19:49:29 -08:00
parent 1ee5668cac
commit 65f2cda381
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/content/dactyl.js
View File

@@ -723,8 +723,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
function add(ary) { function add(ary) {
description.push( description.push(
["dl", {}, template.map(ary, ["dl", {}, template.map(ary,
function ([a, b]) [["dt", {}, a], " ", ([a, b]) => [["dt", {}, a], " ",
["dd", {}, b]])]); ["dd", {}, b]])]);
} }
if (obj.completer && false) if (obj.completer && false)
@@ -1270,7 +1270,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
cache.register("help/index.xml", function () { cache.register("help/index.xml", function () {
return '<?xml version="1.0"?>\n' + return '<?xml version="1.0"?>\n' +
DOM.toXML(["overlay", { xmlns: "dactyl" }, DOM.toXML(["overlay", { xmlns: "dactyl" },
template.map(dactyl.indices, ([name, iter]) => template.map(iter(dactyl.indices),
([name, iter]) =>
["dl", { insertafter: name + "-index" }, ["dl", { insertafter: name + "-index" },
template.map(iter(), util.identity)], template.map(iter(), util.identity)],
"\n\n")]); "\n\n")]);
@@ -1280,7 +1281,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
return '<?xml version="1.0"?>\n' + return '<?xml version="1.0"?>\n' +
DOM.toXML(["overlay", { xmlns: "dactyl" }, DOM.toXML(["overlay", { xmlns: "dactyl" },
["dl", { insertafter: "dialog-list" }, ["dl", { insertafter: "dialog-list" },
template.map(config.dialogs, ([name, val]) => template.map(iter(config.dialogs),
([name, val]) =>
(!val[2] || val[2]()) (!val[2] || val[2]())
? [["dt", {}, name], ? [["dt", {}, name],
["dd", {}, val[0]]] ["dd", {}, val[0]]]
@@ -1293,8 +1295,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
DOM.toXML(["overlay", { xmlns: "dactyl" }, DOM.toXML(["overlay", { xmlns: "dactyl" },
["dl", { insertafter: "sanitize-items" }, ["dl", { insertafter: "sanitize-items" },
template.map(options.get("sanitizeitems").values template.map(options.get("sanitizeitems").values
.sort((a, b) => String.localeCompare(a.name, .sort((a, b) => String.localeCompare(a.name,
b.name)), b.name)),
({ name, description }) => ({ name, description }) =>
[["dt", {}, name], [["dt", {}, name],
["dd", {}, template.linkifyHelp(description, true)]], ["dd", {}, template.linkifyHelp(description, true)]],

2
common/modules/dom.jsm
View File

@@ -598,7 +598,7 @@ var DOM = Class("DOM", {
res.push(["span", { highlight: "HelpXML" }, res.push(["span", { highlight: "HelpXML" },
["span", { highlight: "HelpXMLTagStart" }, ["span", { highlight: "HelpXMLTagStart" },
"<", namespaced(elem), " ", "<", namespaced(elem), " ",
template.map(array.iterValues(elem.attributes), template.map(elem.attributes,
attr => [ attr => [
["span", { highlight: "HelpXMLAttribute" }, namespaced(attr)], ["span", { highlight: "HelpXMLAttribute" }, namespaced(attr)],
["span", { highlight: "HelpXMLString" }, attr.value] ["span", { highlight: "HelpXMLString" }, attr.value]

2
common/modules/javascript.jsm
View File

@@ -490,7 +490,7 @@ var JavaScript = Module("javascript", {
if (callable(func)) { if (callable(func)) {
let [, prefix, args] = /^(function .*?)\((.*?)\)/.exec(Function.prototype.toString.call(func)); let [, prefix, args] = /^(function .*?)\((.*?)\)/.exec(Function.prototype.toString.call(func));
let n = this._get(i).comma.length; let n = this._get(i).comma.length;
args = template.map(Iterator(args.split(", ")), args = template.map(args.split(", ").entries(),
([i, arg]) => ["span", { highlight: i == n ? "Filter" : "" }, arg], ([i, arg]) => ["span", { highlight: i == n ? "Filter" : "" }, arg],
",\u00a0"); ",\u00a0");
this.context.message = ["", prefix + "(", args, ")"]; this.context.message = ["", prefix + "(", args, ")"];

6
common/modules/sanitizer.jsm
View File

@@ -201,9 +201,11 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
["column", { flex: "1" }], ["column", { flex: "1" }],
["column", { flex: "1" }]], ["column", { flex: "1" }]],
["rows", {}, ["rows", {},
template.map(util.range(0, Math.ceil(items.length / 2)), i => template.map(util.range(0, Math.ceil(items.length / 2)),
i =>
["row", {}, ["row", {},
template.map(items.slice(i * 2, i * 2 + 2), item => template.map(items.slice(i * 2, i * 2 + 2),
item =>
["checkbox", { xmlns: XUL, label: item.description, preference: branch + item.name }])])]]] ["checkbox", { xmlns: XUL, label: item.description, preference: branch + item.name }])])]]]
} }
}); });

2
pentadactyl/install.rdf
View File

@@ -31,7 +31,7 @@
<em:targetApplication> <em:targetApplication>
<Description <Description
em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
em:minVersion="31.0" em:minVersion="34.0"
em:maxVersion="39.*"/> em:maxVersion="39.*"/>
</em:targetApplication> </em:targetApplication>
</Description> </Description>