aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/xml/xml.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-04 15:31:40 -0700
committerValerio Virgillito2012-05-04 15:31:40 -0700
commit3ebed34665fa73b0ce613b400f3029ebf4476439 (patch)
tree09a3c592035030bda7bb62d1f908ce263377d74c /imports/codemirror/mode/xml/xml.js
parent8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-3ebed34665fa73b0ce613b400f3029ebf4476439.tar.gz
Merge branch 'refs/heads/master' into dom-architecture
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});