diff options
| author | Valerio Virgillito | 2012-07-17 11:29:09 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-17 11:29:09 -0700 |
| commit | 58e86247524cc2d545bd6884f1b5c9fdba3b9164 (patch) | |
| tree | 53305d354fce502ee39378babf47ace6c91ce2fd /imports/codemirror/mode/htmlembedded | |
| parent | 0f0cffd4df85e7adf5081fe66c768c70b2ead9b3 (diff) | |
| parent | 4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff) | |
| download | ninja-58e86247524cc2d545bd6884f1b5c9fdba3b9164.tar.gz | |
Merge branch 'refs/heads/master' into v0.7.1
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"}); |