simditor 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e33c8a152c1ce8e7848a79dea866dc97e8a0720
-  data.tar.gz: 145e99e3c36d6595e9bffbcf04476024315bdadf
+  metadata.gz: d7d7b2dc726e8cd0affd2b1c21be60c45ac71d00
+  data.tar.gz: c8ff4b003b3b1dde07780a79da0c29f1e8dbcf51
 SHA512:
-  metadata.gz: bffdd4d399f8630ab1a43781145e762cf98412d18626b11ca85c74b48af5e5723617cc22b2b6651536355341dd5141465bbb52cc505ed6f36b54155cccc52af6
-  data.tar.gz: 4d48fc3bf0f9dc2c583cc77bb2a8321634faa1444cfe2e0b36d4e3ea7b42e08f291bcddc0e4196466e558c4e7a579adfc11ad45139daa4eb72fdfe5830022291
+  metadata.gz: 22ab34fa9559687c031cf01a63746547d411596d810abad32cacb5966afa94308938d56acc16e4838fefa74b4777064d3da93a3800c14ddac7c2dbf4e5766a75
+  data.tar.gz: 3c9f0d1ae154e3ddd53e721c9847aa7d48486561b459fb522b9f08d51e80170e7c0ee3f922a6ee93576476fbe62b1c8cfc13b983ab194bbe9f6ae28966e4aac3

data/lib/simditor/version.rb

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

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

@@ -1,7 +1,7 @@
 /*!
-* Simditor v2.3.0
+* Simditor v2.3.2
 * http://simditor.tower.im/
-* 2015-10-08
+* 2015-10-15
 */
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
@@ -53,7 +53,7 @@ Selection = (function(superClass) {
     this._selection = document.getSelection();
     this.editor.on('selectionchanged', (function(_this) {
       return function(e) {
-        _this._reset();
+        _this.reset();
         return _this._range = _this._selection.getRangeAt(0);
       };
     })(this));
@@ -64,7 +64,7 @@ Selection = (function(superClass) {
     })(this));
   };
 
-  Selection.prototype._reset = function() {
+  Selection.prototype.reset = function() {
     this._range = null;
     this._startNodes = null;
     this._endNodes = null;
@@ -81,7 +81,7 @@ Selection = (function(superClass) {
     } catch (_error) {
       e = _error;
     }
-    return this._reset();
+    return this.reset();
   };
 
   Selection.prototype.range = function(range) {
@@ -1689,7 +1689,7 @@ Util = (function(superClass) {
     return $(node).is('[class^="simditor-"]');
   };
 
-  Util.prototype.blockNodes = ["div", "p", "ul", "ol", "li", "blockquote", "hr", "pre", "h1", "h2", "h3", "h4", "table"];
+  Util.prototype.blockNodes = ["div", "p", "ul", "ol", "li", "blockquote", "hr", "pre", "h1", "h2", "h3", "h4", "h5", "table"];
 
   Util.prototype.isBlockNode = function(node) {
     node = $(node)[0];
@@ -2195,29 +2195,33 @@ Clipboard = (function(superClass) {
     }
     return this.editor.body.on('paste', (function(_this) {
       return function(e) {
-        var $blockEl, isPlainText, range;
+        var range;
+        if (_this.pasting || _this._pasteBin) {
+          return;
+        }
         if (_this.editor.triggerHandler(e) === false) {
           return false;
         }
         range = _this.editor.selection.deleteRangeContents();
-        if (!range.collapsed) {
-          range.collapse(true);
-        }
-        _this.editor.selection.range(range);
-        $blockEl = _this.editor.selection.blockNodes().last();
-        isPlainText = $blockEl.is('pre, table');
-        if (!isPlainText && _this._processPasteByClipboardApi(e)) {
-          return false;
+        if (_this.editor.body.html()) {
+          if (!range.collapsed) {
+            range.collapse(true);
+          }
+        } else {
+          _this.editor.formatter.format();
+          _this.editor.selection.setRangeAtStartOf(_this.editor.body.find('p:first'));
         }
-        if (_this._pasteBin) {
+        if (_this._processPasteByClipboardApi(e)) {
           return false;
         }
         _this.editor.inputManager.throttledValueChanged.clear();
         _this.editor.inputManager.throttledSelectionChanged.clear();
         _this.editor.undoManager.throttledPushState.clear();
         _this.pasting = true;
-        return _this._getPasteContent(isPlainText, function(pasteContent) {
-          _this._processPasteContent(isPlainText, $blockEl, pasteContent);
+        return _this._getPasteContent(function(pasteContent) {
+          _this._processPasteContent(pasteContent);
+          _this._pasteInBlockEl = null;
+          _this._pastePlainText = null;
           return _this.pasting = false;
         });
       };
@@ -2252,7 +2256,7 @@ Clipboard = (function(superClass) {
     }
   };
 
-  Clipboard.prototype._getPasteContent = function(isPlainText, callback) {
+  Clipboard.prototype._getPasteContent = function(callback) {
     var state;
     this._pasteBin = $('<div contenteditable="true" />').addClass('simditor-paste-bin').attr('tabIndex', '-1').appendTo(this.editor.el);
     state = {
@@ -2267,8 +2271,11 @@ Clipboard = (function(superClass) {
         _this.editor.body.html(state.html);
         _this.editor.undoManager.caretPosition(state.caret);
         _this.editor.body.focus();
-        _this.editor.selection._reset();
-        if (isPlainText) {
+        _this.editor.selection.reset();
+        _this.editor.selection.range();
+        _this._pasteInBlockEl = _this.editor.selection.blockNodes().last();
+        _this._pastePlainText = _this._pasteInBlockEl.is('pre, table');
+        if (_this._pastePlainText) {
           pasteContent = _this.editor.formatter.clearHtml(_this._pasteBin.html(), true);
         } else {
           pasteContent = $('<div/>').append(_this._pasteBin.contents());
@@ -2285,14 +2292,15 @@ Clipboard = (function(superClass) {
     })(this), 0);
   };
 
-  Clipboard.prototype._processPasteContent = function(isPlainText, $blockEl, pasteContent) {
-    var $img, blob, children, insertPosition, k, l, lastLine, len, len1, len2, len3, len4, line, lines, m, node, o, q, ref, ref1, ref2, uploadOpt;
+  Clipboard.prototype._processPasteContent = function(pasteContent) {
+    var $blockEl, $img, blob, children, insertPosition, k, l, lastLine, len, len1, len2, len3, len4, line, lines, m, node, o, q, ref, ref1, ref2, uploadOpt;
     if (this.editor.triggerHandler('pasting', [pasteContent]) === false) {
       return;
     }
+    $blockEl = this._pasteInBlockEl;
     if (!pasteContent) {
       return;
-    } else if (isPlainText) {
+    } else if (this._pastePlainText) {
       if ($blockEl.is('table')) {
         lines = pasteContent.split('\n');
         lastLine = lines.pop();
@@ -3089,7 +3097,7 @@ TitleButton = (function(superClass) {
 
   TitleButton.prototype.name = 'title';
 
-  TitleButton.prototype.htmlTag = 'h1, h2, h3, h4';
+  TitleButton.prototype.htmlTag = 'h1, h2, h3, h4, h5';
 
   TitleButton.prototype.disableTag = 'pre, table';
 
@@ -3129,7 +3137,7 @@ TitleButton = (function(superClass) {
     if (active) {
       param || (param = this.node[0].tagName.toLowerCase());
     }
-    this.el.removeClass('active-p active-h1 active-h2 active-h3');
+    this.el.removeClass('active-p active-h1 active-h2 active-h3 active-h4 active-h5');
     if (active) {
       return this.el.addClass('active active-' + param);
     }
@@ -5327,7 +5335,8 @@ AlignmentButton = (function(superClass) {
     this.nodes.css({
       'text-align': align === 'left' ? '' : align
     });
-    return this.editor.trigger('valuechanged');
+    this.editor.trigger('valuechanged');
+    return this.editor.inputManager.throttledSelectionChanged();
   };
 
   return AlignmentButton;

data/vendor/assets/stylesheets/simditor/editor.scss

@@ -1,6 +1,7 @@
 @charset "UTF-8";
 
 $simditor-button-height: 40px;
+$simditor-button-width: 46px;
 
 .simditor {
   position: relative;
@@ -9,7 +10,6 @@ $simditor-button-height: 40px;
   .simditor-wrapper {
     position: relative;
     background: #ffffff;
-    overflow: hidden;
 
     & > textarea {
       display: none !important;
@@ -120,15 +120,16 @@ $simditor-button-height: 40px;
 
   .simditor-paste-bin {
     position: fixed;
-    bottom: 100px;
-    right: 100px;
-    width: 100px;
-    height: 100px;
+    bottom: 10px;
+    right: 10px;
+    width: 1px;
+    height: 20px;
     font-size: 1px;
     line-height: 1px;
     overflow: hidden;
     padding: 0;
     margin: 0;
+    opacity: 0;
     -webkit-user-select: text;
   }
 
@@ -142,34 +143,29 @@ $simditor-button-height: 40px;
       padding: 0 0 0 6px;
       list-style: none;
 
-      &:after {
-        content:"";
-        display:table;
-        clear:both;
-      }
-
       & > li {
         position: relative;
-        float: left;
+        display: inline-block;
+        font-size: 0;
 
         & > span.separator {
-          display: block;
-          float: left;
+          display: inline-block;
           background: #cfcfcf;
           width: 1px;
           height: 18px;
           margin: ($simditor-button-height - 18px) / 2 15px;
+          vertical-align: middle;
         }
 
         & > .toolbar-item {
-          display: block;
-          float: left;
-          width: 46px;
+          display: inline-block;
+          width: $simditor-button-width;
           height: $simditor-button-height;
           outline: none;
           color: #333333;
           font-size: 15px;
           line-height: $simditor-button-height;
+          vertical-align: middle;
           text-align: center;
           text-decoration: none;
 
@@ -244,9 +240,9 @@ $simditor-button-height: 40px;
         &.menu-on {
           .toolbar-item {
             position: relative;
-            z-index: 21;
+            z-index: 20;
             background: #ffffff;
-            box-shadow: 0 -3px 3px rgba(0,0,0,0.2);
+            box-shadow: 0 1px 4px rgba(0,0,0,0.3);
 
             span {
               opacity: 1;
@@ -265,10 +261,21 @@ $simditor-button-height: 40px;
       position: absolute;
       top: $simditor-button-height;
       left: 0;
-      z-index: 20;
+      z-index: 21;
       background: #ffffff;
       text-align: left;
-      box-shadow: 0 0 3px rgba(0,0,0,0.2);
+      box-shadow: 0 0 4px rgba(0,0,0,0.3);
+
+      &:before {
+        content: '';
+        display: block;
+        width: $simditor-button-width;
+        height: 4px;
+        background: #ffffff;
+        position: absolute;
+        top: -3px;
+        left: 0;
+      }
 
       ul {
         min-width: 160px;
@@ -373,6 +380,7 @@ $simditor-button-height: 40px;
       &.toolbar-menu-table {
         .menu-create-table {
           background: #ffffff;
+          padding: 1px;
 
           table {
             border: none;
@@ -381,19 +389,19 @@ $simditor-button-height: 40px;
             table-layout: fixed;
 
             td {
-              height: 16px;
               padding: 0;
-              border: 2px solid #ffffff;
-              background: #f3f3f3;
               cursor: pointer;
 
               &:before {
                 width: 16px;
+                height: 16px;
+                border: 1px solid #ffffff;
+                background: #f3f3f3;
                 display: block;
                 content: ''
               }
 
-              &.selected {
+              &.selected:before {
                 background: #cfcfcf;
               }
             }
@@ -513,10 +521,6 @@ $simditor-button-height: 40px;
   }
 
   &.simditor-mobile {
-    .simditor-toolbar > ul > li > .toolbar-item {
-      width: 46px;
-    }
-
     .simditor-wrapper.toolbar-floating .simditor-toolbar {
         position: absolute;
         top: 0;

metadata

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