Skip to content

Commit

Permalink
Bugfix issue #kindsoft#167
Browse files Browse the repository at this point in the history
  • Loading branch information
隆昊 committed Sep 12, 2015
1 parent 5a41bd7 commit fd76e3d
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 10 deletions.
1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ ver 4.1.11
* Bugfix: 修复多语言包的一些小错误。
* Bugfix: [IE11] 有些设备报错不能显示,对象不支持attachEvent属性或方法。
* Bugfix: retina屏幕上按钮裂开。
* Bugfix: 编辑图片后点击插入图片,弹出两个dialog。

ver 4.1.10 (2013-11-23)
* Bugfix: 兼容IE11。
Expand Down
14 changes: 7 additions & 7 deletions kindeditor-all-min.js

Large diffs are not rendered by default.

10 changes: 7 additions & 3 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.11 (2015-02-28)
* @version 4.1.11 (2015-09-12)
*******************************************************************************/
(function (window, undefined) {
if (window.KindEditor) {
Expand All @@ -19,7 +19,7 @@ if (!window.console) {
if (!console.log) {
console.log = function () {};
}
var _VERSION = '4.1.11 (2015-02-28)',
var _VERSION = '4.1.11 (2015-09-12)',
_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 @@ -79,7 +79,7 @@ function _inString(val, str, delimiter) {
}
function _addUnit(val, unit) {
unit = unit || 'px';
return val && /^\d+$/.test(val) ? val + unit : val;
return val && /^-?\d+(?:\.\d+)?$/.test(val) ? val + unit : val;
}
function _removeUnit(val) {
var match;
Expand Down Expand Up @@ -5478,6 +5478,10 @@ function _create(expr, options) {
_each(_plugins, function(name, fn) {
if (_isFunction(fn)) {
fn.call(editor, KindEditor);
if (!editor._pluginStatus) {
editor._pluginStatus = {};
}
editor._pluginStatus[name] = 'inited';
}
});
return editor.create();
Expand Down
4 changes: 4 additions & 0 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,10 @@ function _create(expr, options) {
_each(_plugins, function(name, fn) {
if (_isFunction(fn)) {
fn.call(editor, KindEditor);
if (!editor._pluginStatus) {
editor._pluginStatus = {};
}
editor._pluginStatus[name] = 'inited';
}
});
return editor.create();
Expand Down

0 comments on commit fd76e3d

Please sign in to comment.