simditor 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1f44c26e34b3aece6942197da6e3314d0c7c635
-  data.tar.gz: 951effb9402b5164749c2c8ad72b35038ccebe3b
+  metadata.gz: 90022d714fce1f5ad22d442e42f723b4a6b8ca07
+  data.tar.gz: d2cd50d57ab4f38390bb788b1d4a320281481f3b
 SHA512:
-  metadata.gz: 875fb95f73906783e4982f12f1a975686bc7a5beefe85b6344493439d945437434dd4e34da3d09ad0bae09fe383f21039bf2b7e9c3f51ae075e8497d4a2a2db5
-  data.tar.gz: 34711d636b9dec976c9cc847a2c1b89af88088cf6139e5f9e10f0e768f11f7d5ee345c7f68ec708468bc5bb7ce08a9e60b6964c64237e3b2bd324a5fed782a92
+  metadata.gz: 9ca54cffd592bd2fb1addbd26be2f91e7dbb22b3c89f5944f0bf3408f9c70cd6d20e161531ffe60ae00562fa45d9d94a564af91aca7e5bbfc58ab70d9d0ba56f
+  data.tar.gz: b4a4ee18741ab25cde19c9e6cc3e49e454c88c9fb82ada5eefa23795bf27e0e5b12f587306f597350ea754fb99b422b600c2b97695204b6921d41a390fb22fe2

data/lib/simditor/version.rb

@@ -1,5 +1,5 @@
 module Simditor
   module Version
-    EDITOR = "2.3.5"
+    EDITOR = "2.3.6"
   end
 end

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

@@ -1,7 +1,7 @@
 /*!
-* Simditor v2.3.5
+* Simditor v2.3.6
 * http://simditor.tower.im/
-* 2015-11-19
+* 2015-12-21
 */
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
@@ -1348,7 +1348,8 @@ UndoManager = (function(superClass) {
     })(this));
     this.editor.on('selectionchanged', (function(_this) {
       return function(e) {
-        return _this.resetCaretPosition();
+        _this.resetCaretPosition();
+        return _this.update();
       };
     })(this));
     this.editor.on('focus', (function(_this) {
@@ -1430,7 +1431,7 @@ UndoManager = (function(superClass) {
     this.editor.hidePopover();
     this._index -= 1;
     state = this._stack[this._index];
-    this.editor.body.html(state.html);
+    this.editor.body.get(0).innerHTML = state.html;
     this.caretPosition(state.caret);
     this.editor.body.find('.selected').removeClass('selected');
     this.editor.sync();
@@ -1445,7 +1446,7 @@ UndoManager = (function(superClass) {
     this.editor.hidePopover();
     this._index += 1;
     state = this._stack[this._index];
-    this.editor.body.html(state.html);
+    this.editor.body.get(0).innerHTML = state.html;
     this.caretPosition(state.caret);
     this.editor.body.find('.selected').removeClass('selected');
     this.editor.sync();
@@ -1453,13 +1454,12 @@ UndoManager = (function(superClass) {
   };
 
   UndoManager.prototype.update = function() {
-    var currentState, html;
+    var currentState;
     currentState = this.currentState();
     if (!currentState) {
       return;
     }
-    html = this.editor.body.html();
-    currentState.html = html;
+    currentState.html = this.editor.body.html();
     return currentState.caret = this.caretPosition();
   };
 
@@ -2211,7 +2211,8 @@ Clipboard = (function(superClass) {
   Clipboard.pluginName = 'Clipboard';
 
   Clipboard.prototype.opts = {
-    pasteImage: false
+    pasteImage: false,
+    cleanPaste: false
   };
 
   Clipboard.prototype._init = function() {
@@ -2296,13 +2297,13 @@ Clipboard = (function(superClass) {
       return function() {
         var pasteContent;
         _this.editor.hidePopover();
-        _this.editor.body.html(state.html);
+        _this.editor.body.get(0).innerHTML = state.html;
         _this.editor.undoManager.caretPosition(state.caret);
         _this.editor.body.focus();
         _this.editor.selection.reset();
         _this.editor.selection.range();
         _this._pasteInBlockEl = _this.editor.selection.blockNodes().last();
-        _this._pastePlainText = _this._pasteInBlockEl.is('pre, table');
+        _this._pastePlainText = _this.opts.cleanPaste || _this._pasteInBlockEl.is('pre, table');
         if (_this._pastePlainText) {
           pasteContent = _this.editor.formatter.clearHtml(_this._pasteBin.html(), true);
         } else {
@@ -2569,7 +2570,7 @@ Simditor = (function(superClass) {
   Simditor.prototype.setValue = function(val) {
     this.hidePopover();
     this.textarea.val(val);
-    this.body.html(val);
+    this.body.get(0).innerHTML = val;
     this.formatter.format();
     this.formatter.decorate();
     this.util.reflow(this.body);

metadata

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