diff options
| author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
| commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
| tree | ceb527713554f506c537168e36a10452cd09ad10 /imports/codemirror/mode/xml | |
| parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'imports/codemirror/mode/xml')
| -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}); | ||