diff options
author | Jose Antonio Marquez | 2012-05-04 14:00:54 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-04 14:00:54 -0700 |
commit | 9c0bda09a502472768f6dd5090a882d11be58d23 (patch) | |
tree | 28eb75165553daa979be3bc9223d35d875a008dc /imports/codemirror/mode/xml/xml.js | |
parent | 2456f0d60f642016135aa0f96126cb3249343757 (diff) | |
parent | fec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff) | |
download | ninja-9c0bda09a502472768f6dd5090a882d11be58d23.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'imports/codemirror/mode/xml/xml.js')
-rw-r--r-- | imports/codemirror/mode/xml/xml.js | 3 |
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 | ||
266 | CodeMirror.defineMIME("application/xml", "xml"); | 266 | CodeMirror.defineMIME("application/xml", "xml"); |
267 | CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true}); | 267 | if (!CodeMirror.mimeModes.hasOwnProperty("text/html")) |
268 | CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true}); | ||