aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/xml/xml.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-07 11:00:22 -0700
committerPushkar Joshi2012-05-07 11:00:22 -0700
commite5ae6e0b6e54db0e6efd75d1f14cb791060ed67a (patch)
treee84d2dc5033c1b5c1b993662660a90af12584b69 /imports/codemirror/mode/xml/xml.js
parentba890518b5a35d5e6893f9fc72d2eee30ae07e17 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'imports/codemirror/mode/xml/xml.js')
-rw-r--r--imports/codemirror/mode/xml/xml.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/imports/codemirror/mode/xml/xml.js b/imports/codemirror/mode/xml/xml.js
index f467bddc..d8f17efb 100644
--- a/imports/codemirror/mode/xml/xml.js
+++ b/imports/codemirror/mode/xml/xml.js
@@ -264,4 +264,5 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
264}); 264});
265 265
266CodeMirror.defineMIME("application/xml", "xml"); 266CodeMirror.defineMIME("application/xml", "xml");
267CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true}); 267if (!CodeMirror.mimeModes.hasOwnProperty("text/html"))
268 CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true});