diff options
| author | Jon Reid | 2012-07-17 16:03:14 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-07-17 16:03:14 -0700 |
| commit | 42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3 (patch) | |
| tree | 67deeb8c5b34aacc91f737cc64a3bc9ef1f4f05f /imports/codemirror/mode/htmlembedded/htmlembedded.js | |
| parent | a12cabc16273ffe04af4bce1f7438dc9326efa89 (diff) | |
| parent | b4b3e45d6684e77d361b4f8ca5be4889428320c5 (diff) | |
| download | ninja-42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'imports/codemirror/mode/htmlembedded/htmlembedded.js')
| -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"}); |