diff --git a/module/common/view/kindeditor.html.php b/module/common/view/kindeditor.html.php index 2bcd6f5ddf..3659eeb61d 100755 --- a/module/common/view/kindeditor.html.php +++ b/module/common/view/kindeditor.html.php @@ -45,7 +45,7 @@ function initKindeditor(afterInit) if(editor.tools == 'fullTools') editorTool = fullTools; var K = KindEditor, $editor = $('#' + editorID); - window.editor['#'] = window.editor[editorID] = K.create('#' + editorID, + var options = { cssPath:[themeRoot + 'zui/css/min.css'], width:'100%', @@ -106,7 +106,9 @@ function initKindeditor(afterInit) } /* End */ } - }); + }; + try {window.editor['#'] = window.editor[editorID] = K.create('#' + editorID, options);} + catch(e){} }); if($.isFunction(afterInit)) afterInit(); diff --git a/www/js/my.full.js b/www/js/my.full.js index b0a45c5cb3..0910a7f5bf 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -914,12 +914,11 @@ function setModal() if(modal.data('first')) modal.data('first', false); }, 100); - if($framebody.data('resizing')) + if(navigator.userAgent.indexOf("MSIE 8.0") < 0) { - $framebody.data('resizing', true).resize(function() + $framebody.resize(function() { modalBody.css('height', $framebody.outerHeight()); - console.log('resize'+(new Date())); }); } } @@ -930,7 +929,7 @@ function setModal() iframe$.extend({'closeModal': $.closeModal}); } } - catch(e){modal.removeClass('modal-loading'); console.log('error');} + catch(e){modal.removeClass('modal-loading');} } modal.modal('show'); }