aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/htmlmixed
diff options
context:
space:
mode:
authorJonathan Duran2012-07-17 11:42:09 -0700
committerJonathan Duran2012-07-17 11:42:09 -0700
commitb4b3e45d6684e77d361b4f8ca5be4889428320c5 (patch)
tree2156d9920ea1b7db49ed6460545fea7cda121bae /imports/codemirror/mode/htmlmixed
parent4a87ff575693509ac578d46af26fa137c0dc3f58 (diff)
parent4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
downloadninja-b4b3e45d6684e77d361b4f8ca5be4889428320c5.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'imports/codemirror/mode/htmlmixed')
-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");