From 46860a838baa5e9b2c7759256700e86022eb01d2 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 25 May 2016 10:34:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=AE=BE=E7=BD=AE=E8=A1=A8=E6=A0=BC=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86=E5=90=8E=E6=89=80=E6=9C=89=E7=9A=84=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E7=BA=BF=E5=AE=BD=E5=BA=A6=E9=83=BD=E4=B8=80=E6=A0=B7=202.KE?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98=E5=AD=97=E4=BD=93=E5=90=8E=E5=86=8D=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=AD=97=E4=BD=93=E4=BC=9A=E6=A0=87=E6=98=8E=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=9A=84=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                | 5 +++--
 public/assets/kindeditor/plugins/code/previewcode.css | 6 +++---
 public/assets/kindeditor/plugins/table/table.js       | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index a8c17345b..39ce0abdb 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -297,7 +297,7 @@ K.options = {
 		'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', '.text-overflow','.overflow','.white-space'
+			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border','.border-color', '.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'],
@@ -2539,7 +2539,8 @@ function _nativeCommand(doc, key, val) {
 function _nativeCommandValue(doc, key) {
 	var val = '';
 	try {
-		val = doc.query_nativeCommand(self.doc, name, val);Value(key);
+//		val = doc.query_nativeCommand(self.doc, name, val);Value(key);
+        val = doc.queryCommandValue(key);
 	} catch (e) {}
 	if (typeof val !== 'string') {
 		val = '';
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index 65c75d6ea..352c77625 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -1,7 +1,7 @@
 .ke-content {
-    font-size: 12px;
-    font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: ΢���ź�, ����;
-    font-family:Tahoma;
+    font-size: 14px;
+    /*font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;*/
+    font-family: "微软雅黑","宋体";
 }
 .ke-content pre {
     font-size:9pt;
diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js
index be386f7cc..74b14b118 100644
--- a/public/assets/kindeditor/plugins/table/table.js
+++ b/public/assets/kindeditor/plugins/table/table.js
@@ -257,6 +257,7 @@ KindEditor.plugin('table', function(K) {
                             style += 'border-color:'+borderColor+';';
                         }
                         style += 'table-layout: '+'fixed;';
+                        style += 'border-collapse: collapse;';
 						var html = '<table';
 						if (style !== '') {
 							html += ' style="' + style + '"';
@@ -283,7 +284,7 @@ KindEditor.plugin('table', function(K) {
 						for (var i = 0; i < rows; i++) {
 							html += '<tr>';
 							for (var j = 0; j < cols; j++) {
-								html += '<td style="text-overflow:inherit;overflow: hidden;white-space: nowrap" >' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+								html += '<td style="border:'+ border+'px solid;border-color:' + borderColor+';text-overflow:inherit;overflow: hidden;white-space: nowrap" >' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
 							}
 							html += '</tr>';
 						}