From e073d581691cdc77b35b841d0496b23bc02fdb6c Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Wed, 9 Mar 2016 10:16:27 +0800 Subject: [PATCH] =?UTF-8?q?KE=E7=9A=84=E5=87=A0=E4=B8=AA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=201.=E6=88=91=E8=A6=81=E5=9B=9E=E5=A4=8D=202?= =?UTF-8?q?.=E6=AE=B5=E8=90=BD=E9=A2=9C=E8=89=B2=203.=E5=8F=98=E7=B2=97?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E7=A7=BB=E5=8A=A8=204.=E6=B2=A1?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/kindeditor.js | 2 +- public/assets/kindeditor/plugins/code/previewcode.css | 1 + public/assets/kindeditor/plugins/image/image.js | 3 +++ public/assets/kindeditor/plugins/media/media.js | 3 +++ public/assets/kindeditor/plugins/preview/preview.js | 2 +- public/assets/kindeditor/plugins/table/table.js | 3 +++ public/stylesheets/new_user.css | 6 +++--- 7 files changed, 15 insertions(+), 5 deletions(-) diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 6065a563f..6da24733c 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -2765,7 +2765,7 @@ _extend(KCmd, { sel.addRange(rng); if (doc !== document) { var pos = K(rng.endContainer).pos(); - win.scrollTo(pos.x, pos.y); + //win.scrollTo(pos.x, pos.y); } } win.focus(); diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css index c8e5df4e1..7ccc0a6f9 100644 --- a/public/assets/kindeditor/plugins/code/previewcode.css +++ b/public/assets/kindeditor/plugins/code/previewcode.css @@ -1,5 +1,6 @@ .ke-content { font-size: 10pt; + font-family:Tahoma; } .ke-content pre { font-size:9pt; diff --git a/public/assets/kindeditor/plugins/image/image.js b/public/assets/kindeditor/plugins/image/image.js index 1c3f0dd45..82646d73a 100644 --- a/public/assets/kindeditor/plugins/image/image.js +++ b/public/assets/kindeditor/plugins/image/image.js @@ -98,6 +98,9 @@ KindEditor.plugin('image', function(K) { yesBtn : { name : self.lang('yes'), click : function(e) { + if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(self.edit.html())){ + self.edit.html(''); + } // Bugfix: http://code.google.com/p/kindeditor/issues/detail?id=319 if (dialog.isLoading) { return; diff --git a/public/assets/kindeditor/plugins/media/media.js b/public/assets/kindeditor/plugins/media/media.js index 6d0d3a387..e108d8595 100644 --- a/public/assets/kindeditor/plugins/media/media.js +++ b/public/assets/kindeditor/plugins/media/media.js @@ -47,6 +47,9 @@ KindEditor.plugin('media', function(K) { yesBtn : { name : self.lang('yes'), click : function(e) { + if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(self.edit.html())){ + self.edit.html(''); + } var url = K.trim(urlBox.val()), width = widthBox.val(), height = heightBox.val(); diff --git a/public/assets/kindeditor/plugins/preview/preview.js b/public/assets/kindeditor/plugins/preview/preview.js index ef6e2cf16..c32c5a1c9 100644 --- a/public/assets/kindeditor/plugins/preview/preview.js +++ b/public/assets/kindeditor/plugins/preview/preview.js @@ -25,7 +25,7 @@ KindEditor.plugin('preview', function(K) { doc.open(); doc.write(self.fullHtml()); doc.close(); - K(doc.body).css('background-color', '#FFF'); + K(doc.body).css({'background-color': '#FFF','word-break':'break-all','word-wrap':'wrap-all'}); iframe[0].contentWindow.focus(); }); }); diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js index 634e9b7fc..ba72a0ff8 100644 --- a/public/assets/kindeditor/plugins/table/table.js +++ b/public/assets/kindeditor/plugins/table/table.js @@ -129,6 +129,9 @@ KindEditor.plugin('table', function(K) { yesBtn : { name : self.lang('yes'), click : function(e) { + if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(self.edit.html())){ + self.edit.html(''); + } var rows = rowsBox.val(), cols = colsBox.val(), width = widthBox.val(), diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index a923ae86f..d2ec8a8b9 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -32,9 +32,9 @@ table{ background:#fff;} .min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 135px -193px no-repeat; cursor:pointer;} .db {display:block;} /* font & color */ -h2{ font-size:18px; color:#269ac9;} -h3{ font-size:14px; color:#e8770d;} -h4{ font-size:14px; color:#3b3b3b;} +h2{ font-size:18px; } /*color:#269ac9;*/ +h3{ font-size:14px;}/* color:#e8770d;*/ +h4{ font-size:14px; }/*color:#3b3b3b;*/ .f12{font-size:12px; font-weight:normal;} .f14{font-size:14px;} .f16{font-size:16px;}