aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/htmlmixed/htmlmixed.js
diff options
context:
space:
mode:
authorJon Reid2012-05-04 14:56:24 -0700
committerJon Reid2012-05-04 14:56:24 -0700
commita6dd2917edcfeca1be7553e03281ddd538422ae1 (patch)
treee6846626bf1e967e80bcd652f6a76bb97abb1789 /imports/codemirror/mode/htmlmixed/htmlmixed.js
parent7fc185cc08b2ba912dbc7bce96f6a465c1dd6dbf (diff)
parent8964e070fa760d23c2de272ca36b8d9beba6007d (diff)
downloadninja-a6dd2917edcfeca1be7553e03281ddd538422ae1.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'imports/codemirror/mode/htmlmixed/htmlmixed.js')
-rw-r--r--imports/codemirror/mode/htmlmixed/htmlmixed.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/htmlmixed/htmlmixed.js b/imports/codemirror/mode/htmlmixed/htmlmixed.js
index a94dc45f..c66a6583 100644
--- a/imports/codemirror/mode/htmlmixed/htmlmixed.js
+++ b/imports/codemirror/mode/htmlmixed/htmlmixed.js
@@ -28,7 +28,7 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
28 function javascript(stream, state) { 28 function javascript(stream, state) {
29 if (stream.match(/^<\/\s*script\s*>/i, false)) { 29 if (stream.match(/^<\/\s*script\s*>/i, false)) {
30 state.token = html; 30 state.token = html;
31 state.curState = null; 31 state.localState = null;
32 state.mode = "html"; 32 state.mode = "html";
33 return html(stream, state); 33 return html(stream, state);
34 } 34 }