diff options
| author | Ananya Sen | 2012-07-17 14:25:53 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-07-17 14:25:53 -0700 |
| commit | 09457e39532e9b35afb9c635266755bfcb9b488a (patch) | |
| tree | 665dcbd41377b98dcab15ff995e9434d9db1a462 /imports/codemirror/mode/htmlembedded | |
| parent | f2dbca782bbaca3bed96dff808693693ba083ea9 (diff) | |
| parent | 4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff) | |
| download | ninja-09457e39532e9b35afb9c635266755bfcb9b488a.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix
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"}); |