diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /imports/codemirror/mode/htmlmixed/htmlmixed.js | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'imports/codemirror/mode/htmlmixed/htmlmixed.js')
| -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 | } |