Skip to content

Commit

Permalink
event.returnValue only for IE, and non-IE it will be deprecated (source)
Browse files Browse the repository at this point in the history
  • Loading branch information
luolonghao committed Nov 23, 2013
1 parent 2f31684 commit 3847e50
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 19 deletions.
1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ver 4.1.10
* Bugfix: 引入kindeditor-all.js后开启自动高度插件会报错。
* Bugfix: ®来回切换代码模式后变成(R)。
* Bugfix: 字体、文字大小、颜色等操作有toogle效果。
* Bugfix: 非IE设置returnValue和cancelBubble。

ver 4.1.9 (2013-10-08)
* Bugfix: 选中后无法添加超级链接。
Expand Down
8 changes: 4 additions & 4 deletions kindeditor-all-min.js

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

10 changes: 6 additions & 4 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.9 (2013-11-17)
* @version 4.1.9 (2013-11-23)
*******************************************************************************/
(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.9 (2013-11-17)',
var _VERSION = '4.1.9 (2013-11-23)',
_ua = navigator.userAgent.toLowerCase(),
_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
_NEWIE = _ua.indexOf('msie') == -1 && _ua.indexOf('trident') > -1,
Expand Down Expand Up @@ -399,15 +399,17 @@ _extend(KEvent, {
var ev = this.event;
if (ev.preventDefault) {
ev.preventDefault();
} else {
ev.returnValue = false;
}
ev.returnValue = false;
},
stopPropagation : function() {
var ev = this.event;
if (ev.stopPropagation) {
ev.stopPropagation();
} else {
ev.cancelBubble = true;
}
ev.cancelBubble = true;
},
stop : function() {
this.preventDefault();
Expand Down
Loading

0 comments on commit 3847e50

Please sign in to comment.