1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-14 06:35:46 +01:00

Death to E4X and stuff.

This commit is contained in:
Kris Maglione
2012-11-29 18:00:50 -08:00
parent 2e17932cdb
commit 810eda169a
15 changed files with 265 additions and 45 deletions

View File

@@ -1582,7 +1582,7 @@ var CommandLine = Module("commandline", {
else if (callable(arg))
arg = String.replace(arg, "/* use strict */ \n", "/* use strict */ ");
else if (!isString(arg) && useColor)
arg = template.highlight(arg);
arg = template_.highlight(arg);
return arg;
}
}, {

View File

@@ -256,7 +256,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
results = results.filter(function (item) filters.every(function (re) keys(item).some(re.closure.test)));
commandline.commandOutput(
template.usage(results, params.format));
template_.usage(results, params.format));
},
{
argCount: "*",
@@ -1166,7 +1166,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
error.message = prefix + error.message;
if (error.message)
dactyl.echoerr(template.linkifyHelp(error.message));
dactyl.echoerr(template_.linkifyHelp(error.message));
else
dactyl.beep();

View File

@@ -765,14 +765,13 @@ var Mappings = Module("mappings", {
}
},
format: {
description: function (map) (XML.ignoreWhitespace = false, XML.prettyPrinting = false, <>
{options.get("passkeys").has(map.name)
? <span highlight="URLExtra">
({template.linkifyHelp(_("option.passkeys.passedBy"))})
</span>
: <></>}
{template.linkifyHelp(map.description + (map.rhs ? ": " + map.rhs : ""))}
</>),
description: function (map) [
options.get("passkeys").has(map.name)
? ["span", { highlight: "URLExtra" },
"(", template_.linkifyHelp(_("option.passkeys.passedBy")), ")"]
: [],
template_.linkifyHelp(map.description + (map.rhs ? ": " + map.rhs : ""))
],
help: function (map) let (char = array.compact(map.modes.map(function (m) m.char))[0])
char === "n" ? map.name : char ? char + "_" + map.name : "",
headings: ["Command", "Mode", "Group", "Description"]

View File

@@ -265,7 +265,7 @@ var Marks = Module("marks", {
}
commandline.commandOutput(
template.tabular(
template_.tabular(
["Mark", "HPos", "VPos", "File"],
["", "text-align: right", "text-align: right", "color: green"],
([name,

View File

@@ -113,7 +113,7 @@ var QuickMarks = Module("quickmarks", {
dactyl.assert(marks.length >= 0, _("quickmark.noMatching", filter.quote()));
}
commandline.commandOutput(template.tabular(["QuickMark", "URL"], [],
commandline.commandOutput(template_.tabular(["QuickMark", "URL"], [],
([mark, quickmarks._qmarks.get(mark)] for ([k, mark] in Iterator(marks)))));
}
}, {

View File

@@ -35,9 +35,9 @@ var Tabs = Module("tabs", {
tabs.switchTo(event.originalTarget.getAttribute("identifier"));
};
this.tabBinding = styles.system.add("tab-binding", "chrome://browser/content/browser.xul", String.replace(literal(/*
this.tabBinding = styles.system.add("tab-binding", "chrome://browser/content/browser.xul", literal(/*
xul|tab { -moz-binding: url(chrome://dactyl/content/bindings.xml#tab) !important; }
*/), /tab-./g, function (m) config.OS.isMacOSX ? "tab-mac" : m),
*/).replace(/tab-./g, function (m) config.OS.isMacOSX ? "tab-mac" : m),
false, true);
this.timeout(function () {