Skip to content

Commit

Permalink
Build 4.1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
luolonghao committed Nov 23, 2013
1 parent 4fad461 commit 2181d5b
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<property name="lang" value="lang"/>
<property name="plugins" value="plugins"/>
<property name="filename" value="kindeditor"/>
<property name="version" value="4.1.9"/>
<property name="version" value="4.1.10"/>
<property name="charset" value="utf-8"/>
<property name="dist" value="dist/${filename}-${version}"/>

Expand Down
2 changes: 1 addition & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
#######################################################################

ver 4.1.10
ver 4.1.10 (2013-11-23)
* Bugfix: 兼容IE11。
* Bugfix: [IE6-7] 上传按钮界面错乱。
* Bugfix: 引入kindeditor-all.js后开启自动高度插件会报错。
Expand Down
4 changes: 2 additions & 2 deletions kindeditor-all-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-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-23)
* @version 4.1.10 (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-23)',
var _VERSION = '4.1.10 (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
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.9 (2013-11-23)
* @version 4.1.10 (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-23)',
var _VERSION = '4.1.10 (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
6 changes: 3 additions & 3 deletions test/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h1 id="type">KindEditor Main Test</h1>
<td align="center">
<form method="post" action="../php/demo.php">
<textarea name="content1" cols="100" rows="20" style="width:100%;height:200px;"><div>
<img alt="" src="/kindeditor/plugins/emoticons/images/0.gif" />
<img alt="" src="/kindeditor/plugins/emoticons/images/0.gif" />
<div>
123
</div>
Expand Down Expand Up @@ -248,7 +248,7 @@ <h1 id="type">KindEditor Main Test</h1>
select.options.add(new Option(url, url));
},
afterCreate : function() {
this.loadPlugin('autoheight');
//this.loadPlugin('autoheight');
}
});
K('#create1').click(function(e) {
Expand Down Expand Up @@ -322,7 +322,7 @@ <h1 id="type">KindEditor Main Test</h1>
K('#uploadFile')[0].focus();
},
afterCreate : function() {
this.loadPlugin('autoheight');
//this.loadPlugin('autoheight');
}
});
K('#create2').click(function(e) {
Expand Down

0 comments on commit 2181d5b

Please sign in to comment.