diff options
author | Ananya Sen | 2012-07-16 16:04:05 -0700 |
---|---|---|
committer | Ananya Sen | 2012-07-16 16:04:05 -0700 |
commit | 0e04fff0ea80fa5cbe96b8354db38bd334aea83a (patch) | |
tree | 212d164c0f83d80394e34f1df532ea0461ad328d /imports/codemirror/mode/htmlembedded | |
parent | 5146f224258929415adf4a8022e492454b4e2476 (diff) | |
download | ninja-0e04fff0ea80fa5cbe96b8354db38bd334aea83a.tar.gz |
upgrade to codemirror 2.3
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Conflicts:
js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
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"}); |