aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/xml
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-03 23:01:31 -0700
committerValerio Virgillito2012-05-03 23:01:31 -0700
commit60388a7d01d9e34b5cd15bd5cb190a610e4f9a0e (patch)
tree9bfa4cc0fdb3a39abf151c05d013f2cde7aad296 /imports/codemirror/mode/xml
parentdca94d9d1e2a6a113356b685df991472ea3e5576 (diff)
parentfec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff)
downloadninja-60388a7d01d9e34b5cd15bd5cb190a610e4f9a0e.tar.gz
Merge branch 'refs/heads/master' into tag-2.0
Diffstat (limited to 'imports/codemirror/mode/xml')
-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});