move undo delta merging to the editor

2013-06-17 01:30:22 +04:00 · 2013-06-17 01:30:22 +04:00 · ef2e2cdd11
commit ef2e2cdd11
parent 277675525b
3 changed files with 64 additions and 55 deletions
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@ -407,10 +407,10 @@ var EditSession = function(text, mode) {
                    undoManager.execute({
                        action: "aceupdate",
                        args: [self.$deltas, self],
-                        merge: self.coalesceDeltas
+                        merge: self.mergeUndoDeltas
                    });
                }
-                self.coalesceDeltas = false;
+                self.mergeUndoDeltas = false;
                self.$deltas = [];
            }
            this.$informUndoManager = lang.delayedCall(this.$syncInformUndoManager);