diff options
| author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
| commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
| tree | ceb527713554f506c537168e36a10452cd09ad10 /imports/codemirror/mode/htmlmixed | |
| parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'imports/codemirror/mode/htmlmixed')
| -rw-r--r-- | imports/codemirror/mode/htmlmixed/htmlmixed.js | 2 |
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 | } |