FIX: undo bug

mlhorizon · Oct 28, 2015 · 80b921e · 80b921e
1 parent b0c85f1
commit 80b921e
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 31 deletions.
diff --git a/lib/simditor.js b/lib/simditor.js
@@ -1,7 +1,7 @@
 /*!
 * Simditor v2.3.3
 * http://simditor.tower.im/
-* 2015-10-22
+* 2015-10-28
 */
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
@@ -903,9 +903,9 @@ InputManager = (function(superClass) {
           if (_this.lastCaretPosition) {
             _this.editor.undoManager.caretPosition(_this.lastCaretPosition);
           } else {
-            $blockEl = _this.body.children.first();
+            $blockEl = _this.editor.body.children().first();
             range = document.createRange();
-            _this.selection.setRangeAtStartOf($blockEl, range);
+            _this.editor.selection.setRangeAtStartOf($blockEl, range);
           }
         }
         _this.lastCaretPosition = null;
@@ -1329,7 +1329,7 @@ UndoManager = (function(superClass) {
       return function() {
         return _this._pushUndoState();
       };
-    })(this), 500);
+    })(this), 2000);
     this.editor.on('valuechanged', (function(_this) {
       return function(e, src) {
         if (src === 'undo' || src === 'redo') {
@@ -1340,8 +1340,14 @@ UndoManager = (function(superClass) {
     })(this));
     this.editor.on('selectionchanged', (function(_this) {
       return function(e) {
-        _this.resetCaretPosition();
-        return _this.update();
+        return _this.resetCaretPosition();
+      };
+    })(this));
+    this.editor.on('focus', (function(_this) {
+      return function(e) {
+        if (_this._stack.length === 0) {
+          return _this._pushUndoState();
+        }
       };
     })(this));
     return this.editor.on('blur', (function(_this) {
@@ -1380,19 +1386,18 @@ UndoManager = (function(superClass) {
   };
 
   UndoManager.prototype._pushUndoState = function() {
-    var currentState, html;
+    var caret;
     if (this.editor.triggerHandler('pushundostate') === false) {
       return;
     }
-    currentState = this.currentState();
-    html = this.editor.body.html();
-    if (currentState && currentState.html === html) {
+    caret = this.caretPosition();
+    if (!caret.start) {
       return;
     }
     this._index += 1;
     this._stack.length = this._index;
     this._stack.push({
-      html: html,
+      html: this.editor.body.html(),
       caret: this.caretPosition()
     });
     if (this._stack.length > this._capacity) {

diff --git a/site/assets/scripts/simditor.js b/site/assets/scripts/simditor.js
@@ -898,9 +898,9 @@ InputManager = (function(superClass) {
           if (_this.lastCaretPosition) {
             _this.editor.undoManager.caretPosition(_this.lastCaretPosition);
           } else {
-            $blockEl = _this.body.children.first();
+            $blockEl = _this.editor.body.children().first();
             range = document.createRange();
-            _this.selection.setRangeAtStartOf($blockEl, range);
+            _this.editor.selection.setRangeAtStartOf($blockEl, range);
           }
         }
         _this.lastCaretPosition = null;
@@ -1324,7 +1324,7 @@ UndoManager = (function(superClass) {
       return function() {
         return _this._pushUndoState();
       };
-    })(this), 500);
+    })(this), 2000);
     this.editor.on('valuechanged', (function(_this) {
       return function(e, src) {
         if (src === 'undo' || src === 'redo') {
@@ -1335,8 +1335,14 @@ UndoManager = (function(superClass) {
     })(this));
     this.editor.on('selectionchanged', (function(_this) {
       return function(e) {
-        _this.resetCaretPosition();
-        return _this.update();
+        return _this.resetCaretPosition();
+      };
+    })(this));
+    this.editor.on('focus', (function(_this) {
+      return function(e) {
+        if (_this._stack.length === 0) {
+          return _this._pushUndoState();
+        }
       };
     })(this));
     return this.editor.on('blur', (function(_this) {
@@ -1375,19 +1381,18 @@ UndoManager = (function(superClass) {
   };
 
   UndoManager.prototype._pushUndoState = function() {
-    var currentState, html;
+    var caret;
     if (this.editor.triggerHandler('pushundostate') === false) {
       return;
     }
-    currentState = this.currentState();
-    html = this.editor.body.html();
-    if (currentState && currentState.html === html) {
+    caret = this.caretPosition();
+    if (!caret.start) {
       return;
     }
     this._index += 1;
     this._stack.length = this._index;
     this._stack.push({
-      html: html,
+      html: this.editor.body.html(),
       caret: this.caretPosition()
     });
     if (this._stack.length > this._capacity) {

diff --git a/src/inputManager.coffee b/src/inputManager.coffee
@@ -127,9 +127,9 @@ class InputManager extends SimpleModule
         if @lastCaretPosition
           @editor.undoManager.caretPosition @lastCaretPosition
         else
-          $blockEl = @body.children.first()
+          $blockEl = @editor.body.children().first()
           range = document.createRange()
-          @selection.setRangeAtStartOf $blockEl, range
+          @editor.selection.setRangeAtStartOf $blockEl, range
 
       @lastCaretPosition = null
       @editor.triggerHandler 'focus'

diff --git a/src/undoManager.coffee b/src/undoManager.coffee
@@ -38,15 +38,18 @@ class UndoManager extends SimpleModule
 
     @throttledPushState = @editor.util.throttle =>
       @_pushUndoState()
-    , 500
+    , 2000
 
     @editor.on 'valuechanged', (e, src) =>
       return if src == 'undo' or src == 'redo'
       @throttledPushState()
 
     @editor.on 'selectionchanged', (e) =>
       @resetCaretPosition()
-      @update()
+      # @update()
+
+    @editor.on 'focus', (e) =>
+      @_pushUndoState() if @_stack.length == 0
 
     @editor.on 'blur', (e) =>
       @resetCaretPosition()
@@ -74,15 +77,18 @@ class UndoManager extends SimpleModule
   _pushUndoState: ->
     return if @editor.triggerHandler('pushundostate') == false
 
-    currentState = @currentState()
-    html = @editor.body.html()
-    return if currentState and currentState.html == html
+    # currentState = @currentState()
+    # html = @editor.body.html()
+    # return if currentState and currentState.html == html
+
+    caret = @caretPosition()
+    return unless caret.start
 
     @_index += 1
     @_stack.length = @_index
 
     @_stack.push
-      html: html
+      html: @editor.body.html()
       caret: @caretPosition()
 
     if @_stack.length > @_capacity
@@ -135,7 +141,6 @@ class UndoManager extends SimpleModule
     currentState.html = html
     currentState.caret = @caretPosition()
 
-
   _getNodeOffset: (node, index) ->
     if $.isNumeric index
       $parent = $(node)

diff --git a/styles/simditor.css b/styles/simditor.css
@@ -1,7 +1,7 @@
 /*!
 * Simditor v2.3.3
 * http://simditor.tower.im/
-* 2015-10-20
+* 2015-10-28
 */
 @font-face {
   font-family: 'Simditor';