vendor/assets/javascripts/codemirror/utils/overlay.js in codemirror-rails-2.24 vs vendor/assets/javascripts/codemirror/utils/overlay.js in codemirror-rails-2.32

- old
+ new

@@ -4,10 +4,11 @@ // can override the style of text. Both modes get to parse all of the // text, but when both assign a non-null style to a piece of code, the // 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 { base: CodeMirror.startState(base), overlay: CodeMirror.startState(overlay),