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/lib/util/overlay.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'imports/codemirror/lib/util/overlay.js') diff --git a/imports/codemirror/lib/util/overlay.js b/imports/codemirror/lib/util/overlay.js index c4cdf9fc..1d5df6c6 100644 --- a/imports/codemirror/lib/util/overlay.js +++ b/imports/codemirror/lib/util/overlay.js @@ -6,7 +6,8 @@ // overlay wins, unless the combine argument was true, in which case // the styles are combined. -CodeMirror.overlayParser = function(base, overlay, combine) { +// overlayParser is the old, deprecated name +CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, combine) { return { startState: function() { return { @@ -43,7 +44,7 @@ CodeMirror.overlayParser = function(base, overlay, combine) { else return state.overlayCur; }, - indent: function(state, textAfter) { + indent: base.indent && function(state, textAfter) { return base.indent(state.base, textAfter); }, electricChars: base.electricChars -- cgit v1.2.3