simditor 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bfac9eeeec173e7ef5a1076fee5ad36e7435161
-  data.tar.gz: 739aa8ed4dac5e2b4a537b392726ef09aaafd46c
+  metadata.gz: ec61d0e7a6dd0c7dd0e645f8595398f1b030feb1
+  data.tar.gz: 2671a55ad34cc9a1887212d71cda892190516d0b
 SHA512:
-  metadata.gz: 356962cc0ced287091a068fef9965fa7d2f7746f1777a55219bd834cf35326e356d97503127edb2b89ff57e8ddc7fb96165376e646ca0b29292427702839d026
-  data.tar.gz: d93a1bc1535f1f0df11b4ced75ba76159607bc31859e5c64f1dafa1dc32c2c7c41684250255569eb3178c9f5c69b665b373f040fca0ee5fc3f1988c5e70839ff
+  metadata.gz: a2601e898469485b36a3e9d40aff91bb22d9c911f9e743ceafd9784086f767efa4c09ac244da12410face9d600af760b6a6819252531de81d55e8794ecf860b8
+  data.tar.gz: 997dc809b2c734a149870ac2dc64c21b9a6373f00652c913d133cf82287329c922c425e81f4bae3408dfcf6b3a4e49b643c97345ed5a50cc1c8f27dacda6f402

data/lib/simditor/version.rb

@@ -1,5 +1,5 @@
 module Simditor
   module Version
-    EDITOR = "2.2.2"
+    EDITOR = "2.2.3"
   end
 end

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

@@ -1,8 +1,3 @@
-/*!
-* Simditor v2.2.2
-* http://simditor.tower.im/
-* 2015-07-31
-*/
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module unless amdModuleId is set
@@ -1577,6 +1572,9 @@ UndoManager = (function(superClass) {
       return;
     }
     html = this.editor.body.html();
+    if (html !== currentState.html) {
+      return;
+    }
     currentState.html = html;
     return currentState.caret = this.caretPosition();
   };
@@ -1669,11 +1667,7 @@ UndoManager = (function(superClass) {
       } : {};
       return caret;
     } else {
-      if (!this.editor.inputManager.focused) {
-        this.editor.body.focus();
-      }
       if (!caret.start) {
-        this.editor.body.blur();
         return;
       }
       startContainer = this._getNodeByPosition(caret.start);
@@ -1985,7 +1979,7 @@ Toolbar = (function(superClass) {
   };
 
   Toolbar.prototype._init = function() {
-    var toolbarHeight;
+    var floatInitialized, initToolbarFloat, toolbarHeight;
     this.editor = this._module;
     if (!this.opts.toolbar) {
       return;
@@ -2010,21 +2004,30 @@ Toolbar = (function(superClass) {
     if (!this.opts.toolbarHidden && this.opts.toolbarFloat) {
       this.wrapper.css('top', this.opts.toolbarFloatOffset);
       toolbarHeight = 0;
-      $(window).on('resize.simditor-' + this.editor.id, (function(_this) {
-        return function(e) {
+      initToolbarFloat = (function(_this) {
+        return function() {
           _this.wrapper.css('position', 'static');
           _this.wrapper.width('auto');
           _this.editor.util.reflow(_this.wrapper);
           _this.wrapper.width(_this.wrapper.outerWidth());
-          _this.wrapper.css('left', _this.wrapper.offset().left);
+          _this.wrapper.css('left', _this.editor.util.os.mobile ? _this.wrapper.position().left : _this.wrapper.offset().left);
           _this.wrapper.css('position', '');
           toolbarHeight = _this.wrapper.outerHeight();
-          return _this.editor.placeholderEl.css('top', toolbarHeight);
+          _this.editor.placeholderEl.css('top', toolbarHeight);
+          return true;
         };
-      })(this)).resize();
+      })(this);
+      $(window).on('resize.simditor-' + this.editor.id, function(e) {
+        var floatInitialized;
+        return floatInitialized = null;
+      });
+      floatInitialized = null;
       $(window).on('scroll.simditor-' + this.editor.id, (function(_this) {
         return function(e) {
           var bottomEdge, scrollTop, topEdge;
+          if (!_this.wrapper.is(':visible')) {
+            return;
+          }
           topEdge = _this.editor.wrapper.offset().top;
           bottomEdge = topEdge + _this.editor.wrapper.outerHeight() - 80;
           scrollTop = $(document).scrollTop() + _this.opts.toolbarFloatOffset;
@@ -2034,6 +2037,7 @@ Toolbar = (function(superClass) {
               return _this.wrapper.css('top', _this.opts.toolbarFloatOffset);
             }
           } else {
+            floatInitialized || (floatInitialized = initToolbarFloat());
             _this.editor.wrapper.addClass('toolbar-floating').css('padding-top', toolbarHeight);
             if (_this.editor.util.os.mobile) {
               return _this.wrapper.css('top', scrollTop - topEdge + _this.opts.toolbarFloatOffset);
@@ -2461,7 +2465,6 @@ Simditor = (function(superClass) {
   };
 
   Simditor.prototype.focus = function() {
-    var $blockEl, range;
     if (!(this.body.is(':visible') && this.body.is('[contenteditable]'))) {
       this.el.find('textarea:visible').focus();
       return;
@@ -2469,12 +2472,6 @@ Simditor = (function(superClass) {
     if (this.inputManager.lastCaretPosition) {
       return this.undoManager.caretPosition(this.inputManager.lastCaretPosition);
     } else {
-      $blockEl = this.body.find('p').last();
-      if (!($blockEl.length > 0)) {
-        $blockEl = $('<p/>').append(this.util.phBr).appendTo(this.body);
-      }
-      range = document.createRange();
-      this.selection.setRangeAtEndOf($blockEl, range);
       return this.body.focus();
     }
   };
@@ -2518,6 +2515,7 @@ Simditor.i18n = {
     'bold': '加粗文字',
     'code': '插入代码',
     'color': '文字颜色',
+    'coloredText': '彩色文字',
     'hr': '分隔线',
     'image': '插入图片',
     'externalImage': '外链图片',
@@ -2562,6 +2560,7 @@ Simditor.i18n = {
     'bold': 'Bold',
     'code': 'Code',
     'color': 'Text Color',
+    'coloredText': 'Colored Text',
     'hr': 'Horizontal Line',
     'image': 'Insert Image',
     'externalImage': 'External Image',
@@ -3222,7 +3221,7 @@ ColorButton = (function(superClass) {
     });
     return this.menuWrapper.on('click', '.font-color', (function(_this) {
       return function(e) {
-        var $link, $p, hex, rgb;
+        var $link, $p, hex, range, rgb, textNode;
         _this.wrapper.removeClass('menu-on');
         $link = $(e.currentTarget);
         if ($link.hasClass('font-color-default')) {
@@ -3239,6 +3238,13 @@ ColorButton = (function(superClass) {
         if (!hex) {
           return;
         }
+        range = _this.editor.selection.range();
+        if (!$link.hasClass('font-color-default') && range.collapsed) {
+          textNode = document.createTextNode(_this._t('coloredText'));
+          range.insertNode(textNode);
+          range.selectNodeContents(textNode);
+          _this.editor.selection.range(range);
+        }
         document.execCommand('styleWithCSS', false, true);
         document.execCommand('foreColor', false, hex);
         document.execCommand('styleWithCSS', false, false);
@@ -4270,12 +4276,13 @@ ImagePopover = (function(superClass) {
     this.altEl = this.el.find('#image-alt');
     this.srcEl.on('keydown', (function(_this) {
       return function(e) {
+        var range;
         if (!(e.which === 13 && !_this.target.hasClass('uploading'))) {
           return;
         }
         e.preventDefault();
-        _this.button.editor.body.focus();
-        _this.button.editor.selection.setRangeAfter(_this.target);
+        range = document.createRange();
+        _this.button.editor.selection.setRangeAfter(_this.target, range);
         return _this.hide();
       };
     })(this));
@@ -4301,7 +4308,7 @@ ImagePopover = (function(superClass) {
     })(this));
     this.el.find('.image-size').on('keydown', (function(_this) {
       return function(e) {
-        var inputEl;
+        var $img, inputEl, range;
         inputEl = $(e.currentTarget);
         if (e.which === 13 || e.which === 27) {
           e.preventDefault();
@@ -4310,9 +4317,10 @@ ImagePopover = (function(superClass) {
           } else {
             _this._restoreImg();
           }
-          _this.button.editor.body.focus();
-          _this.button.editor.selection.setRangeAfter(_this.target);
-          return _this.hide();
+          $img = _this.target;
+          _this.hide();
+          range = document.createRange();
+          return _this.button.editor.selection.setRangeAfter($img, range);
         } else if (e.which === 9) {
           return _this.el.data('popover').refresh();
         }
@@ -4320,10 +4328,11 @@ ImagePopover = (function(superClass) {
     })(this));
     this.altEl.on('keydown', (function(_this) {
       return function(e) {
+        var range;
         if (e.which === 13) {
           e.preventDefault();
-          _this.button.editor.body.focus();
-          _this.button.editor.selection.setRangeAfter(_this.target);
+          range = document.createRange();
+          _this.button.editor.selection.setRangeAfter(_this.target, range);
           return _this.hide();
         }
       };
@@ -4393,7 +4402,7 @@ ImagePopover = (function(superClass) {
       onlySetVal = false;
     }
     value = inputEl.val() * 1;
-    if (!($.isNumeric(value) || value < 0)) {
+    if (!(this.target && ($.isNumeric(value) || value < 0))) {
       return;
     }
     if (inputEl.is(this.widthEl)) {
@@ -4410,8 +4419,8 @@ ImagePopover = (function(superClass) {
         width: width,
         height: height
       });
+      return this.editor.trigger('valuechanged');
     }
-    return this.editor.trigger('valuechanged');
   };
 
   ImagePopover.prototype._restoreImg = function() {

metadata

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