From 80c6edd2d33ff6a4f0a1e8fe1526afa37e523967 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 13 May 2016 14:22:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?KE=E8=BF=87=E6=BB=A4html=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E8=A1=A8=E6=A0=BC=E7=9A=84=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E7=AD=89=E6=A0=B7=E5=BC=8F=E4=B8=8D=E8=83=BD=E8=A2=AB?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/kindeditor.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index f96216658..9ae1300e7 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -290,14 +290,14 @@ K.options = { ], table: [ 'id', 'class', 'border', 'cellspacing', 'cellpadding', 'width', 'height', 'align', 'bordercolor', - '.padding', '.margin', '.border', 'bgcolor', '.text-align', '.color', '.background-color', + '.padding', '.margin', '.border','.border-color', 'bgcolor', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight', '.font-style', '.text-decoration', '.background', - '.width', '.height', '.border-collapse' + '.width', '.height', '.border-collapse','.table-layout' ], 'td,th': [ 'id', 'class', 'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight', - '.font-style', '.text-decoration', '.vertical-align', '.background', '.border' + '.font-style', '.text-decoration', '.vertical-align', '.background', '.border', '.text-overflow','.overflow','.white-space' ], a : ['id', 'class', 'href', 'target', 'name'], embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'], @@ -736,6 +736,8 @@ function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) { html = html.replace(/\u200B/g, ''); html = html.replace(/\u00A9/g, '©'); html = html.replace(/\u00AE/g, '®'); + html = html.replace(/\u2003/g, ' '); + html = html.replace(/\u3000/g, ' '); html = html.replace(/<[^>]+/g, function($0) { return $0.replace(/\s+/g, ' '); }); From fc0f92738dd15c1944e3228c99ba6c06f8ad464f Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 13 May 2016 14:58:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E7=B2=98=E8=B4=B4?= =?UTF-8?q?=E6=97=B6=E5=B0=86=E5=9B=BE=E7=89=87=E6=89=80=E5=B8=A6=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/pasteimg.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js index 385e02ac2..44aba63c9 100644 --- a/public/assets/kindeditor/pasteimg.js +++ b/public/assets/kindeditor/pasteimg.js @@ -417,10 +417,12 @@ function uploadpic(piclist,myself) { that.attr("data-ke-src", str[tIndex]); //非视频 - if(!(that.parent().attr("class") && that.parent().attr("class") == "mediaIcobox" )) { - that.parent().attr("href", str[tIndex]); - that.parent().attr("data-ke-src", str[tIndex]); - } +// if(!(that.parent().attr("class") && that.parent().attr("class") == "mediaIcobox" )) { +// that.parent().attr("href", str[tIndex]); +// that.parent().attr("data-ke-src", str[tIndex]); +// } + that.parent().removeAttr("href"); + that.parent().removeAttr("data-ke-src"); tIndex = tIndex + 1; } } From a67ee38ac9ff1be30ea92643849c4aa19b147c77 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 13 May 2016 15:18:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=86=E5=A4=8D=E5=88=B6=E7=B2=98?= =?UTF-8?q?=E8=B4=B4=E7=9A=84=E5=9B=BE=E7=89=87=20=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E5=8F=8Aclass=E9=83=BD=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/pasteimg.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js index 44aba63c9..8831ba300 100644 --- a/public/assets/kindeditor/pasteimg.js +++ b/public/assets/kindeditor/pasteimg.js @@ -416,11 +416,8 @@ function uploadpic(piclist,myself) { that.attr("src", str[tIndex]); that.attr("data-ke-src", str[tIndex]); - //非视频 -// if(!(that.parent().attr("class") && that.parent().attr("class") == "mediaIcobox" )) { -// that.parent().attr("href", str[tIndex]); -// that.parent().attr("data-ke-src", str[tIndex]); -// } + that.removeAttr("class"); + that.parent().removeAttr("class"); that.parent().removeAttr("href"); that.parent().removeAttr("data-ke-src"); tIndex = tIndex + 1;