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 <Ananya.Sen@motorola.com>

Conflicts:

	js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 imports/codemirror/mode/htmlembedded/htmlembedded.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'imports/codemirror/mode/htmlembedded/htmlembedded.js')

diff --git a/imports/codemirror/mode/htmlembedded/htmlembedded.js b/imports/codemirror/mode/htmlembedded/htmlembedded.js
index 08e170ea..1773aeb5 100644
--- a/imports/codemirror/mode/htmlembedded/htmlembedded.js
+++ b/imports/codemirror/mode/htmlembedded/htmlembedded.js
@@ -61,7 +61,7 @@ CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
 
     electricChars: "/{}:"
   }
-});
+}, "htmlmixed");
 
 CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingModeSpec:"javascript"});
 CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});
-- 
cgit v1.2.3