From 0e04fff0ea80fa5cbe96b8354db38bd334aea83a Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 16 Jul 2012 16:04:05 -0700 Subject: upgrade to codemirror 2.3 Signed-off-by: Ananya Sen Conflicts: js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css Signed-off-by: Ananya Sen --- imports/codemirror/mode/htmlmixed/htmlmixed.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'imports/codemirror/mode/htmlmixed') 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) { }, compareStates: function(a, b) { + if (a.mode != b.mode) return false; + if (a.localState) return CodeMirror.Pass; return htmlMode.compareStates(a.htmlState, b.htmlState); }, electricChars: "/{}:" } -}); +}, "xml", "javascript", "css"); CodeMirror.defineMIME("text/html", "htmlmixed"); -- cgit v1.2.3