aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/htmlembedded
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-17 11:28:39 -0700
committerValerio Virgillito2012-07-17 11:28:39 -0700
commit4f737b24c19ddc02d20f9783b8b080fc6ef11142 (patch)
tree212d164c0f83d80394e34f1df532ea0461ad328d /imports/codemirror/mode/htmlembedded
parent5146f224258929415adf4a8022e492454b4e2476 (diff)
parent0e04fff0ea80fa5cbe96b8354db38bd334aea83a (diff)
downloadninja-4f737b24c19ddc02d20f9783b8b080fc6ef11142.tar.gz
Merge pull request #396 from ananyasen/codemirror2.3-upgrade
upgrade to codemirror 2.3
Diffstat (limited to 'imports/codemirror/mode/htmlembedded')
-rw-r--r--imports/codemirror/mode/htmlembedded/htmlembedded.js2
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
66CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingModeSpec:"javascript"}); 66CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingModeSpec:"javascript"});
67CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"}); 67CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});