aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/htmlmixed
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-08 16:43:43 -0700
committerArmen Kesablyan2012-05-08 16:43:43 -0700
commitdc075ffcc6dd03c090d90fad999eee9b924d56ee (patch)
tree867f8bdd588c8f9076979233ca46a688ff70523e /imports/codemirror/mode/htmlmixed
parent5d7e470351fd150d5e70a97332fa2f2553797499 (diff)
parent4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff)
downloadninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: js/components/layout/tools-properties.reel/tools-properties.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 }