diff options
| author | Jose Antonio Marquez | 2012-07-17 14:01:12 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-07-17 14:01:12 -0700 |
| commit | f40c8c58638da8fcd9a7abb06b8f2a4c6ba995bd (patch) | |
| tree | cb1ff6a31b144fe4f584f778d5691f06362b227e /imports/codemirror/mode/htmlembedded | |
| parent | 17d464e5bd224cdd8940855409359b411325f1df (diff) | |
| parent | 4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff) | |
| download | ninja-f40c8c58638da8fcd9a7abb06b8f2a4c6ba995bd.tar.gz | |
Merge branch 'refs/heads/Ninja-Master' into Document
Diffstat (limited to 'imports/codemirror/mode/htmlembedded')
| -rw-r--r-- | imports/codemirror/mode/htmlembedded/htmlembedded.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/htmlembedded/htmlembedded.js b/imports/codemirror/mode/htmlembedded/htmlembedded.js index 08e170ea..1773aeb5 100644 --- a/imports/codemirror/mode/htmlembedded/htmlembedded.js +++ b/imports/codemirror/mode/htmlembedded/htmlembedded.js | |||
| @@ -61,7 +61,7 @@ CodeMirror.defineMode("htmlembedded", function(config, parserConfig) { | |||
| 61 | 61 | ||
| 62 | electricChars: "/{}:" | 62 | electricChars: "/{}:" |
| 63 | } | 63 | } |
| 64 | }); | 64 | }, "htmlmixed"); |
| 65 | 65 | ||
| 66 | CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingModeSpec:"javascript"}); | 66 | CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingModeSpec:"javascript"}); |
| 67 | CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"}); | 67 | CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"}); |