aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/lib/util/overlay.js
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/lib/util/overlay.js
parent4a87ff575693509ac578d46af26fa137c0dc3f58 (diff)
parent4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
downloadninja-b4b3e45d6684e77d361b4f8ca5be4889428320c5.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'imports/codemirror/lib/util/overlay.js')
-rw-r--r--imports/codemirror/lib/util/overlay.js5
1 files changed, 3 insertions, 2 deletions
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 @@
6// overlay wins, unless the combine argument was true, in which case 6// overlay wins, unless the combine argument was true, in which case
7// the styles are combined. 7// the styles are combined.
8 8
9CodeMirror.overlayParser = function(base, overlay, combine) { 9// overlayParser is the old, deprecated name
10CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, combine) {
10 return { 11 return {
11 startState: function() { 12 startState: function() {
12 return { 13 return {
@@ -43,7 +44,7 @@ CodeMirror.overlayParser = function(base, overlay, combine) {
43 else return state.overlayCur; 44 else return state.overlayCur;
44 }, 45 },
45 46
46 indent: function(state, textAfter) { 47 indent: base.indent && function(state, textAfter) {
47 return base.indent(state.base, textAfter); 48 return base.indent(state.base, textAfter);
48 }, 49 },
49 electricChars: base.electricChars 50 electricChars: base.electricChars