simditor 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7d7b2dc726e8cd0affd2b1c21be60c45ac71d00
-  data.tar.gz: c8ff4b003b3b1dde07780a79da0c29f1e8dbcf51
+  metadata.gz: a61682a517164bfe3f1b80ca3a66b3f9dfe88ecf
+  data.tar.gz: ac805da42d5c91e87d4dc417ad52093c5f73b259
 SHA512:
-  metadata.gz: 22ab34fa9559687c031cf01a63746547d411596d810abad32cacb5966afa94308938d56acc16e4838fefa74b4777064d3da93a3800c14ddac7c2dbf4e5766a75
-  data.tar.gz: 3c9f0d1ae154e3ddd53e721c9847aa7d48486561b459fb522b9f08d51e80170e7c0ee3f922a6ee93576476fbe62b1c8cfc13b983ab194bbe9f6ae28966e4aac3
+  metadata.gz: b8f856c710f083c793db827cdc58babf051746757110de3c77aef70f91096833ae06a1f13a6f130a531867211c746feebe64c041daf7c0c3bd6dc072b604011b
+  data.tar.gz: 0cfc93f4cc6a01b7e5e9a6d51ff0d1313b39b335f5501e5b5f9c48a2b1fd85d5e65357a6784d062948f2e4da857357435afa0464e3a335a4c1413ace1cb77a61

data/lib/simditor/version.rb

@@ -1,5 +1,5 @@
 module Simditor
   module Version
-    EDITOR = "2.3.2"
+    EDITOR = "2.3.3"
   end
 end

data/vendor/assets/javascripts/simditor/simditor.js

@@ -1,7 +1,7 @@
 /*!
-* Simditor v2.3.2
+* Simditor v2.3.3
 * http://simditor.tower.im/
-* 2015-10-15
+* 2015-10-20
 */
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
@@ -594,6 +594,9 @@ Formatter = (function(superClass) {
           blockNode = $('<p/>').insertBefore(node);
         }
         blockNode.append(node);
+        if (this.editor.util.isEmptyNode(blockNode)) {
+          blockNode.append(this.editor.util.phBr);
+        }
       }
     }
     return $el;
@@ -878,19 +881,12 @@ InputManager = (function(superClass) {
       })(this));
     }
     submitKey = this.editor.util.os.mac ? 'cmd+enter' : 'ctrl+enter';
-    this.editor.hotkeys.add(submitKey, (function(_this) {
+    return this.editor.hotkeys.add(submitKey, (function(_this) {
       return function(e) {
         _this.editor.el.closest('form').find('button:submit').click();
         return false;
       };
     })(this));
-    if (this.editor.textarea.attr('autofocus')) {
-      return setTimeout((function(_this) {
-        return function() {
-          return _this.editor.focus();
-        };
-      })(this), 0);
-    }
   };
 
   InputManager.prototype._onFocus = function(e) {
@@ -899,9 +895,20 @@ InputManager = (function(superClass) {
     }
     this.editor.el.addClass('focus').removeClass('error');
     this.focused = true;
-    this.lastCaretPosition = null;
     return setTimeout((function(_this) {
       return function() {
+        var $blockEl, range;
+        range = _this.editor.selection._selection.getRangeAt(0);
+        if (range.startContainer === _this.editor.body[0]) {
+          if (_this.lastCaretPosition) {
+            _this.editor.undoManager.caretPosition(_this.lastCaretPosition);
+          } else {
+            $blockEl = _this.body.children.first();
+            range = document.createRange();
+            _this.selection.setRangeAtStartOf($blockEl, range);
+          }
+        }
+        _this.lastCaretPosition = null;
         _this.editor.triggerHandler('focus');
         if (!_this.editor.util.support.onselectionchange) {
           return _this.throttledSelectionChanged();
@@ -1333,19 +1340,22 @@ UndoManager = (function(superClass) {
     })(this));
     this.editor.on('selectionchanged', (function(_this) {
       return function(e) {
-        _this._startPosition = null;
-        _this._endPosition = null;
+        _this.resetCaretPosition();
         return _this.update();
       };
     })(this));
     return this.editor.on('blur', (function(_this) {
       return function(e) {
-        _this._startPosition = null;
-        return _this._endPosition = null;
+        return _this.resetCaretPosition();
       };
     })(this));
   };
 
+  UndoManager.prototype.resetCaretPosition = function() {
+    this._startPosition = null;
+    return this._endPosition = null;
+  };
+
   UndoManager.prototype.startPosition = function() {
     if (this.editor.selection._range) {
       this._startPosition || (this._startPosition = this._getPosition('start'));
@@ -1547,7 +1557,11 @@ UndoManager = (function(superClass) {
         endOffset = caret.start[caret.start.length - 1];
       }
       if (!startContainer || !endContainer) {
-        throw new Error('simditor: invalid caret state');
+        if (typeof console !== "undefined" && console !== null) {
+          if (typeof console.warn === "function") {
+            console.warn('simditor: invalid caret state');
+          }
+        }
         return;
       }
       range = document.createRange();
@@ -2217,6 +2231,8 @@ Clipboard = (function(superClass) {
         _this.editor.inputManager.throttledValueChanged.clear();
         _this.editor.inputManager.throttledSelectionChanged.clear();
         _this.editor.undoManager.throttledPushState.clear();
+        _this.editor.selection.reset();
+        _this.editor.undoManager.resetCaretPosition();
         _this.pasting = true;
         return _this._getPasteContent(function(pasteContent) {
           _this._processPasteContent(pasteContent);
@@ -2476,7 +2492,10 @@ Simditor = (function(superClass) {
             return _this._placeholder();
           });
         }
-        return _this.setValue(_this.textarea.val().trim() || '');
+        _this.setValue(_this.textarea.val().trim() || '');
+        if (_this.textarea.attr('autofocus')) {
+          return _this.focus();
+        }
       };
     })(this));
     if (this.util.browser.mozilla) {
@@ -2582,15 +2601,15 @@ Simditor = (function(superClass) {
       return;
     }
     if (this.inputManager.lastCaretPosition) {
-      return this.undoManager.caretPosition(this.inputManager.lastCaretPosition);
+      this.undoManager.caretPosition(this.inputManager.lastCaretPosition);
+      return this.inputManager.lastCaretPosition = null;
     } else {
       $blockEl = this.body.children().last();
       if (!$blockEl.is('p')) {
         $blockEl = $('<p/>').append(this.util.phBr).appendTo(this.body);
       }
       range = document.createRange();
-      this.selection.setRangeAtEndOf($blockEl, range);
-      return this.body.focus();
+      return this.selection.setRangeAtEndOf($blockEl, range);
     }
   };
 
@@ -4227,15 +4246,15 @@ ImageButton = (function(superClass) {
           if ($mask) {
             $mask.remove();
           }
-          return $img.removeData('mask');
+          $img.removeData('mask');
+          _this.editor.trigger('valuechanged');
+          if (_this.editor.body.find('img.uploading').length < 1) {
+            return _this.editor.uploader.trigger('uploadready', [file, result]);
+          }
         });
         if (_this.popover.active) {
           _this.popover.srcEl.prop('disabled', false);
-          _this.popover.srcEl.val(result.file_path);
-        }
-        _this.editor.trigger('valuechanged');
-        if (_this.editor.body.find('img.uploading').length < 1) {
-          return _this.editor.uploader.trigger('uploadready', [file, result]);
+          return _this.popover.srcEl.val(result.file_path);
         }
       };
     })(this));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simditor
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Wentao Liu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies: []
 description: Rails assets wrapper for https://github.com/mycolorway/simditor
 email: