aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/htmlmixed
diff options
context:
space:
mode:
authorEric Guzman2012-05-10 14:51:31 -0700
committerEric Guzman2012-05-10 14:51:31 -0700
commit39f23ad4868482f395d2e210490a2d73545a9d84 (patch)
treec702d67585f72cddf55932411e7100133bc58452 /imports/codemirror/mode/htmlmixed
parent733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'imports/codemirror/mode/htmlmixed')
-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 }