CHG: bug fix

mycolorway · Oct 17, 2018 · 65d78cb · 65d78cb
1 parent 2bc9ea4
commit 65d78cb
Show file tree

Hide file tree

Showing 10 changed files with 3,464 additions and 15 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "simditor",
-  "version": "2.3.20",
+  "version": "2.3.21",
   "homepage": "http://simditor.tower.im/",
   "authors": [
     "farthinker <farthinker@gmail.com>"

diff --git a/lib/simditor.js b/lib/simditor.js
@@ -1,7 +1,7 @@
 /*!
-* Simditor v2.3.20
+* Simditor v2.3.21
 * http://simditor.tower.im/
-* 2018-08-23
+* 2018-10-17
 */
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
@@ -3157,7 +3157,7 @@ Popover = (function(superClass) {
     }
     this.el.siblings('.simditor-popover').each(function(i, popover) {
       popover = $(popover).data('popover');
-      if (popover.active) {
+      if (popover && popover.active) {
         return popover.hide();
       }
     });
@@ -4489,7 +4489,7 @@ ImageButton = (function(superClass) {
         return;
       }
       $img = $mask.data('img');
-      if (!($img.hasClass('uploading') && $img.parent().length > 0)) {
+      if (!($img && $img.hasClass('uploading') && $img.parent().length > 0)) {
         $mask.remove();
         return;
       }