aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/htmlmixed/htmlmixed.js
diff options
context:
space:
mode:
authorJon Reid2012-07-17 16:03:14 -0700
committerJon Reid2012-07-17 16:03:14 -0700
commit42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3 (patch)
tree67deeb8c5b34aacc91f737cc64a3bc9ef1f4f05f /imports/codemirror/mode/htmlmixed/htmlmixed.js
parenta12cabc16273ffe04af4bce1f7438dc9326efa89 (diff)
parentb4b3e45d6684e77d361b4f8ca5be4889428320c5 (diff)
downloadninja-42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3.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.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/imports/codemirror/mode/htmlmixed/htmlmixed.js b/imports/codemirror/mode/htmlmixed/htmlmixed.js
index c66a6583..a6c62c9d 100644
--- a/imports/codemirror/mode/htmlmixed/htmlmixed.js
+++ b/imports/codemirror/mode/htmlmixed/htmlmixed.js
@@ -73,11 +73,13 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
73 }, 73 },
74 74
75 compareStates: function(a, b) { 75 compareStates: function(a, b) {
76 if (a.mode != b.mode) return false;
77 if (a.localState) return CodeMirror.Pass;
76 return htmlMode.compareStates(a.htmlState, b.htmlState); 78 return htmlMode.compareStates(a.htmlState, b.htmlState);
77 }, 79 },
78 80
79 electricChars: "/{}:" 81 electricChars: "/{}:"
80 } 82 }
81}); 83}, "xml", "javascript", "css");
82 84
83CodeMirror.defineMIME("text/html", "htmlmixed"); 85CodeMirror.defineMIME("text/html", "htmlmixed");