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

Death to E4X and stuff.

Browse Source
This commit is contained in:
Kris Maglione
2012-11-27 22:57:45 -08:00
parent 6200b08c13
commit a0f0668166
5 changed files with 104 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
common/content/abbreviations.js
View File

@@ -262,33 +262,29 @@ var Abbreviations = Module("abbreviations", {
function abbrevs(hive)
hive.merged.filter(function (abbr) (abbr.inModes(modes) && abbr.lhs.indexOf(lhs) == 0));
let list = <table>
<tr highlight="Title">
<td/>
<td style="padding-right: 1em;">{_("title.Mode")}</td>
<td style="padding-right: 1em;">{_("title.Abbrev")}</td>
<td style="padding-right: 1em;">{_("title.Replacement")}</td>
</tr>
<col style="min-width: 6em; padding-right: 1em;"/>
{
template.map(hives, function (hive) let (i = 0)
<tr style="height: .5ex;"/> +
template.map(abbrevs(hive), function (abbrev)
<tr>
<td highlight="Title">{!i++ ? hive.name : ""}</td>
<td>{abbrev.modeChar}</td>
<td>{abbrev.lhs}</td>
<td>{abbrev.rhs}</td>
</tr>) +
<tr style="height: .5ex;"/>)
}
</table>;
let list = ["table", {},
["tr", { highlight: "Title" },
["td"],
["td", { style: "padding-right: 1em;" }, _("title.Mode")],
["td", { style: "padding-right: 1em;" }, _("title.Abbrev")],
["td", { style: "padding-right: 1em;" }, _("title.Replacement")]],
["col", { style: "min-width: 6em; padding-right: 1em;" }],
hives.map(function (hive) let (i = 0) [
["tr", { style: "height: .5ex;" }],
abbrevs(hive).map(function (abbrev)
["tr", {},
["td", { highlight: "Title" }, !i++ ? String(hive.name) : ""],
["td", {}, abbrev.modeChar],
["td", {}, abbrev.lhs],
["td", {}, abbrev.rhs]]),
["tr", { style: "height: .5ex;" }]])];
// TODO: Move this to an ItemList to show this automatically
if (list.*.length() === list.text().length() + 2)
dactyl.echomsg(_("abbreviation.none"));
else
commandline.commandOutput(list);
// FIXME?
// // TODO: Move this to an ItemList to show this automatically
// if (list.*.length() === list.text().length() + 2)
// dactyl.echomsg(_("abbreviation.none"));
// else
commandline.commandOutput(list);
}
}, {

14
common/content/commandline.js
View File

@@ -665,10 +665,14 @@ var CommandLine = Module("commandline", {
*/
commandOutput: function commandOutput(xml) {
XML.ignoreWhitespace = XML.prettyPrinting = false;
if (this.command)
this.echo(<><div xmlns={XHTML}>:{this.command}</div>&#x0d;{xml}</>, this.HIGHLIGHT_NORMAL, this.FORCE_MULTILINE);
else
if (!this.command)
this.echo(xml, this.HIGHLIGHT_NORMAL, this.FORCE_MULTILINE);
else if (isXML(xml))
this.echo(<><div xmlns={XHTML}>:{this.command}</div>&#x0d;{xml}</>,
this.HIGHLIGHT_NORMAL, this.FORCE_MULTILINE);
else
this.echo([["div", { xmlns: "html" }, ":" + this.command], "\n", xml],
this.HIGHLIGHT_NORMAL, this.FORCE_MULTILINE);
this.command = null;
},
@@ -699,7 +703,7 @@ var CommandLine = Module("commandline", {
let field = this.widgets.active.message.inputField;
if (field.value && !forceSingle && field.editor.rootElement.scrollWidth > field.scrollWidth) {
this.widgets.message = null;
mow.echo(<span highlight="Message">{str}</span>, highlightGroup, true);
mow.echo(["span", { highlight: "Message" }, str], highlightGroup, true);
}
},
@@ -737,7 +741,7 @@ var CommandLine = Module("commandline", {
highlightGroup = highlightGroup || this.HL_NORMAL;
if (flags & this.APPEND_TO_MESSAGES) {
let message = isObject(data) ? data : { message: data };
let message = isObject(data) && !DOM.isJSONXML(data) ? data : { message: data };
// Make sure the memoized message property is an instance property.
message.message;

11
common/content/mow.js
View File

@@ -112,7 +112,7 @@ var MOW = Module("mow", {
highlightGroup = "CommandOutput " + (highlightGroup || "");
if (isObject(data) && !isinstance(data, _)) {
if (isObject(data) && !isinstance(data, _) && !DOM.isJSONXML(data)) {
this.lastOutput = null;
var output = DOM(["div", { style: "white-space: nowrap", highlight: highlightGroup }],
@@ -127,9 +127,16 @@ var MOW = Module("mow", {
}
this.messages.push(data);
}
else if (DOM.isJSONXML(data) || isString(data)) {
let style = isString(data) ? "pre-wrap" : "nowrap";
this.lastOutput = ["div", { style: "white-space: " + style, highlight: highlightGroup },
data];
var output = DOM(this.lastOutput, this.document);
}
else {
let style = isString(data) ? "pre-wrap" : "nowrap";
this.lastOutput = <div style={"white-space: " + style} highlight={highlightGroup}>{data}</div>;
this.lastOutput = <div style="white-space: nowrap" highlight={highlightGroup}>{data}</div>;
var output = DOM(this.lastOutput, this.document);
}

10
common/modules/dom.jsm
View File

@@ -10,6 +10,7 @@ defineModule("dom", {
});
lazyRequire("highlight", ["highlight"]);
lazyRequire("messages", ["_"]);
lazyRequire("template", ["template"]);
var XBL = Namespace("xbl", "http://www.mozilla.org/xbl");
@@ -1383,7 +1384,7 @@ var DOM = Class("DOM", {
? function (elem, dir) services.dactyl.getScrollable(elem) & (dir ? services.dactyl["DIRECTION_" + dir.toUpperCase()] : ~0)
: function (elem, dir) true),
isJSONXML: function isJSONXML(val) isArray(val) && isString(val[0]) || isObject(val) && "toDOM" in val,
isJSONXML: function isJSONXML(val) isArray(val) && (isString(val[0]) || isArray(val[0])) || isObject(val) && "toDOM" in val,
DOMString: function (val) ({
toDOM: function toDOM(doc) doc.createTextNode(val)
@@ -1555,7 +1556,11 @@ var DOM = Class("DOM", {
function tag(args, namespaces) {
let _namespaces = namespaces;
if (isinstance(args, ["String", _]))
return doc.createTextNode(args);
let [name, attr] = args;
attr = attr || {};
if (Array.isArray(name) || args.length == 0) {
var frag = doc.createDocumentFragment();
@@ -1607,8 +1612,7 @@ var DOM = Class("DOM", {
elem.setAttribute(key, val);
}
args.forEach(function(e) {
elem.appendChild(typeof e == "object" ? tag(e, namespaces) :
e instanceof Node ? e : doc.createTextNode(e));
elem.appendChild(e instanceof Ci.nsIDOMNode ? e : tag(e, namespaces));
});
if ("highlight" in attr)

57
common/modules/util.jsm
View File

@@ -1024,6 +1024,63 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
return color ? <div style="white-space: pre-wrap;">{string}</div> : [s for each (s in string)].join("");
},
prettifyJSON: function prettifyJSON(data, indent) {
const INDENT = indent || " ";
function rec(data, level, seen) {
if (isObject(data)) {
if (~seen.indexOf(data))
throw Error("Recursive object passed");
seen = seen.concat([data]);
}
let prefix = level + INDENT;
if (data === undefined)
data = null;
if (~["boolean", "number"].indexOf(typeof data) || data === null)
res.push(String(data));
else if (isinstance(data, ["String", _]))
res.push(String.quote(data));
else if (isArray(data)) {
if (data.length == 0)
res.push("[]");
else {
res.push("[\n")
for (let [i, val] in Iterator(data)) {
if (i)
res.push(",\n");
res.push(prefix)
rec(val, prefix, seen);
}
res.push("\n", level, "]");
}
}
else if (isObject(data)) {
res.push("{\n")
let i = 0;
for (let [key, val] in Iterator(data)) {
if (i++)
res.push(",\n");
res.push(prefix, String.quote(key), ": ")
rec(val, prefix, seen);
}
if (i > 0)
res.push("\n", level, "}")
else
res[res.length - 1] = "{}";
}
else
throw Error("Invalid JSON object");
}
let res = [];
rec(data, "", []);
return res.join("");
},
observers: {
"dactyl-cleanup-modules": function (subject, reason) {
defineModule.loadLog.push("dactyl: util: observe: dactyl-cleanup-modules " + reason);