Skip to content

Commit 65d78cb

Browse files
committed
CHG: bug fix
1 parent 2bc9ea4 commit 65d78cb

File tree

10 files changed

+3464
-15
lines changed

10 files changed

+3464
-15
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "simditor",
3-
"version": "2.3.20",
3+
"version": "2.3.21",
44
"homepage": "http://simditor.tower.im/",
55
"authors": [
66
"farthinker <[email protected]>"

lib/simditor.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
2-
* Simditor v2.3.20
2+
* Simditor v2.3.21
33
* http://simditor.tower.im/
4-
* 2018-08-23
4+
* 2018-10-17
55
*/
66
(function (root, factory) {
77
if (typeof define === 'function' && define.amd) {
@@ -3157,7 +3157,7 @@ Popover = (function(superClass) {
31573157
}
31583158
this.el.siblings('.simditor-popover').each(function(i, popover) {
31593159
popover = $(popover).data('popover');
3160-
if (popover.active) {
3160+
if (popover && popover.active) {
31613161
return popover.hide();
31623162
}
31633163
});
@@ -4489,7 +4489,7 @@ ImageButton = (function(superClass) {
44894489
return;
44904490
}
44914491
$img = $mask.data('img');
4492-
if (!($img.hasClass('uploading') && $img.parent().length > 0)) {
4492+
if (!($img && $img.hasClass('uploading') && $img.parent().length > 0)) {
44934493
$mask.remove();
44944494
return;
44954495
}

0 commit comments

Comments
 (0)