Skip to content

Commit

Permalink
Fix issue kindsoft#91
Browse files Browse the repository at this point in the history
  • Loading branch information
luolonghao committed Apr 5, 2013
1 parent 7baad09 commit be814b4
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 13 deletions.
1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

ver 4.1.7
* Bugfix: 取消全屏后没有恢复到原来大小,调整窗口大小后宽高变成全屏宽高。
* Bugfix: [IE] 删除图片、Flash、视频后立即点击图片按钮出错。

ver 4.1.6 (2013-03-24)
* 新增: 韩国语语言包,感谢Github用户composite贡献。
Expand Down
15 changes: 8 additions & 7 deletions kindeditor-all-min.js

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions kindeditor-all.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Roddy <[email protected]>
* @website http://www.kindsoft.net/
* @licence http://www.kindsoft.net/license.php
* @version 4.1.6 (2013-03-27)
* @version 4.1.6 (2013-04-05)
*******************************************************************************/
(function (window, undefined) {
if (window.KindEditor) {
Expand All @@ -17,7 +17,7 @@ if (!window.console) {
if (!console.log) {
console.log = function () {};
}
var _VERSION = '4.1.6 (2013-03-27)',
var _VERSION = '4.1.6 (2013-04-05)',
_ua = navigator.userAgent.toLowerCase(),
_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
Expand Down Expand Up @@ -6819,6 +6819,8 @@ KindEditor.plugin('flash', function(K) {
},
'delete' : function() {
self.plugin.getSelectedFlash().remove();
// [IE] 删除图片后立即点击图片按钮出错
self.addBookmark();
}
};
self.clickToolbar(name, self.plugin.flash.edit);
Expand Down Expand Up @@ -7135,6 +7137,8 @@ KindEditor.plugin('image', function(K) {
target = target.parent();
}
target.remove();
// [IE] 删除图片后立即点击图片按钮出错
self.addBookmark();
}
};
self.clickToolbar(name, self.plugin.image.edit);
Expand Down Expand Up @@ -7682,6 +7686,8 @@ KindEditor.plugin('media', function(K) {
},
'delete' : function() {
self.plugin.getSelectedMedia().remove();
// [IE] 删除图片后立即点击图片按钮出错
self.addBookmark();
}
};
self.clickToolbar(name, self.plugin.media.edit);
Expand Down
4 changes: 2 additions & 2 deletions kindeditor-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions kindeditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Roddy <[email protected]>
* @website http://www.kindsoft.net/
* @licence http://www.kindsoft.net/license.php
* @version 4.1.6 (2013-03-27)
* @version 4.1.6 (2013-04-05)
*******************************************************************************/
(function (window, undefined) {
if (window.KindEditor) {
Expand All @@ -17,7 +17,7 @@ if (!window.console) {
if (!console.log) {
console.log = function () {};
}
var _VERSION = '4.1.6 (2013-03-27)',
var _VERSION = '4.1.6 (2013-04-05)',
_ua = navigator.userAgent.toLowerCase(),
_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
Expand Down
2 changes: 2 additions & 0 deletions plugins/flash/flash.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ KindEditor.plugin('flash', function(K) {
},
'delete' : function() {
self.plugin.getSelectedFlash().remove();
// [IE] 删除图片后立即点击图片按钮出错
self.addBookmark();
}
};
self.clickToolbar(name, self.plugin.flash.edit);
Expand Down
2 changes: 2 additions & 0 deletions plugins/image/image.js
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,8 @@ KindEditor.plugin('image', function(K) {
target = target.parent();
}
target.remove();
// [IE] 删除图片后立即点击图片按钮出错
self.addBookmark();
}
};
self.clickToolbar(name, self.plugin.image.edit);
Expand Down
2 changes: 2 additions & 0 deletions plugins/media/media.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ KindEditor.plugin('media', function(K) {
},
'delete' : function() {
self.plugin.getSelectedMedia().remove();
// [IE] 删除图片后立即点击图片按钮出错
self.addBookmark();
}
};
self.clickToolbar(name, self.plugin.media.edit);
Expand Down

0 comments on commit be814b4

Please sign in to comment.