aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/xml
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-03 16:18:11 -0700
committerValerio Virgillito2012-05-03 16:18:11 -0700
commitf7a493acab51684bc557174ebaba6e80a4869df7 (patch)
tree3d1940acfba351b1aaba4c82a251522de286a0ae /imports/codemirror/mode/xml
parent882f4f4b7427170ff3c3fc76a0ccd727c022bb63 (diff)
parentfec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff)
downloadninja-f7a493acab51684bc557174ebaba6e80a4869df7.tar.gz
Merge branch 'refs/heads/master' into data-id
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});