diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /imports/codemirror/mode/xml/xml.js | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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}); | ||