simditor 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec61d0e7a6dd0c7dd0e645f8595398f1b030feb1
-  data.tar.gz: 2671a55ad34cc9a1887212d71cda892190516d0b
+  metadata.gz: 87642817d1e352fd4361902f136770392a1f26b5
+  data.tar.gz: db226516ec3ed5884e0cf4d9e9c548c3a821cf58
 SHA512:
-  metadata.gz: a2601e898469485b36a3e9d40aff91bb22d9c911f9e743ceafd9784086f767efa4c09ac244da12410face9d600af760b6a6819252531de81d55e8794ecf860b8
-  data.tar.gz: 997dc809b2c734a149870ac2dc64c21b9a6373f00652c913d133cf82287329c922c425e81f4bae3408dfcf6b3a4e49b643c97345ed5a50cc1c8f27dacda6f402
+  metadata.gz: 96314d217cf800af6c5f12d4bc26713ff067a8aac4bcc7302812a9ec5129d397c1474fe4af8cfdb1c23376989f8c16ef2ec96b82f2d8e0ab3f273aa2cd561552
+  data.tar.gz: 9e60e8c0732f9ea65220c7ceb9772ba4dacf0653b90915601968624f7f8cef2bf332e66da1fbeba59575852c4169e47cee576923ac1a4d1817e19ceb533bd513

data/lib/simditor/version.rb

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

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

@@ -1,3 +1,8 @@
+/*!
+* Simditor v2.2.3
+* http://simditor.tower.im/
+* 2015-08-22
+*/
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module unless amdModuleId is set
@@ -3420,6 +3425,9 @@ BlockquoteButton = (function(superClass) {
   BlockquoteButton.prototype.command = function() {
     var $rootNodes, clearCache, nodeCache;
     $rootNodes = this.editor.selection.rootNodes();
+    $rootNodes = $rootNodes.filter(function(i, node) {
+      return !$(node).parent().is('blockquote');
+    });
     this.editor.selection.save();
     nodeCache = [];
     clearCache = (function(_this) {
@@ -3502,6 +3510,7 @@ CodeButton = (function(superClass) {
 
   CodeButton.prototype._status = function() {
     CodeButton.__super__._status.call(this);
+    console.log('test');
     if (this.active) {
       return this.popover.show(this.node);
     } else {
@@ -3532,10 +3541,10 @@ CodeButton = (function(superClass) {
   };
 
   CodeButton.prototype.command = function() {
-    var $rootNodes, clearCache, nodeCache, pres;
+    var $rootNodes, clearCache, nodeCache, resultNodes;
     $rootNodes = this.editor.selection.rootNodes();
     nodeCache = [];
-    pres = [];
+    resultNodes = [];
     clearCache = (function(_this) {
       return function() {
         var $pre;
@@ -3543,17 +3552,18 @@ CodeButton = (function(superClass) {
           return;
         }
         $pre = $("<" + _this.htmlTag + "/>").insertBefore(nodeCache[0]).text(_this.editor.formatter.clearHtml(nodeCache));
-        pres.push($pre[0]);
+        resultNodes.push($pre[0]);
         return nodeCache.length = 0;
       };
     })(this);
     $rootNodes.each((function(_this) {
       return function(i, node) {
-        var $node;
+        var $node, $p;
         $node = $(node);
         if ($node.is(_this.htmlTag)) {
           clearCache();
-          return $('<p/>').append($node.html().replace('\n', '<br/>')).replaceAll($node);
+          $p = $('<p/>').append($node.html().replace('\n', '<br/>')).replaceAll($node);
+          return resultNodes.push($p[0]);
         } else if ($node.is(_this.disableTag) || _this.editor.util.isDecoratedNode($node) || $node.is('blockquote')) {
           return clearCache();
         } else {
@@ -3562,7 +3572,7 @@ CodeButton = (function(superClass) {
       };
     })(this));
     clearCache();
-    this.editor.selection.setRangeAtEndOf($(pres).last());
+    this.editor.selection.setRangeAtEndOf($(resultNodes).last());
     return this.editor.trigger('valuechanged');
   };
 
@@ -3991,6 +4001,7 @@ ImageButton = (function(superClass) {
         return $input = $('<input/>', {
           type: 'file',
           title: _this._t('uploadImage'),
+          multiple: true,
           accept: 'image/*'
         }).appendTo($uploadItem);
       };
@@ -4377,6 +4388,7 @@ ImagePopover = (function(superClass) {
         return _this.input = $('<input/>', {
           type: 'file',
           title: _this._t('uploadImage'),
+          multiple: true,
           accept: 'image/*'
         }).appendTo($uploadBtn);
       };

metadata

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