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

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)