gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-06 17:44:11 +01:00
Code Issues Projects Releases Wiki Activity

Death to E4X and stuff. Also fix some bugs.

Browse Source
This commit is contained in:
Kris Maglione
2012-11-30 19:12:51 -08:00
parent 0c4a25ca86
commit 81b41176b6
12 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
common/modules/util.jsm
View File

@@ -902,12 +902,21 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
* for *obj*.
*/
makeDTD: let (map = { "'": "&apos;", '"': "&quot;", "%": "&#x25;", "&": "&amp;", "<": "&lt;", ">": "&gt;" })
function makeDTD(obj) iter(obj)
.map(function ([k, v]) ["<!ENTITY ", k, " '", String.replace(v == null ? "null" : typeof v == "xml" ? v.toXMLString() : v,
typeof v == "xml" ? /['%]/g : /['"%&<>]/g,
function (m) map[m]),
"'>"].join(""))
.join("\n"),
function makeDTD(obj) {
function escape(val) {
let isDOM = DOM.isJSONXML(val);
return String.replace(val == null ? "null" :
isDOM ? DOM.toXML(val)
: val,
isDOM ? /['%]/g
: /['"%&<>]/g,
function (m) map[m]);
}
return iter(obj).map(function ([k, v])
["<!ENTITY ", k, " '", escape(v), "'>"].join(""))
.join("\n");
},
/**
* Converts a URI string into a URI object.