diff options
| author | Nivesh Rajbhandari | 2012-05-03 17:09:07 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-03 17:09:07 -0700 |
| commit | 8be6e94b57f4bd6e28754a6113b4d6a401365e13 (patch) | |
| tree | 19f48f969ab872b9ef46cc4e7d6c2b9d2544cd4d /imports/codemirror/mode/xml/xml.js | |
| parent | c14b8d9fd1acde98ffc427b0bbdba7d1442c39a4 (diff) | |
| parent | fec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff) | |
| download | ninja-8be6e94b57f4bd6e28754a6113b4d6a401365e13.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
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}); | ||