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] =?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, '&copy;');
 	html = html.replace(/\u00AE/g, '&reg;');
+	html = html.replace(/\u2003/g, '&emsp;');
+	html = html.replace(/\u3000/g, '&emsp;');
 	html = html.replace(/<[^>]+/g, function($0) {
 		return $0.replace(/\s+/g, ' ');
 	});