From 9b5cd8f8807688ac78cd53c0c4fdf25ce32b7fe8 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 10 Mar 2016 11:28:56 +0800
Subject: [PATCH] =?UTF-8?q?KE=E8=A1=A8=E6=A0=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/plugins/table/table.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js
index ba72a0ff8..c96ab0326 100644
--- a/public/assets/kindeditor/plugins/table/table.js
+++ b/public/assets/kindeditor/plugins/table/table.js
@@ -228,8 +228,10 @@ KindEditor.plugin('table', function(K) {
 							}
 							if (borderColor !== '') {
 								table.attr('borderColor', borderColor);
+                                table.css("border-color",borderColor);
 							} else {
 								table.removeAttr('borderColor');
+                                table.css("border-color","none");
 							}
 							self.hideDialog().focus();
 							self.cmd.range.moveToBookmark(bookmark);
@@ -251,7 +253,10 @@ KindEditor.plugin('table', function(K) {
                         if (border !== ''){
                             style += 'border:'+border+'px solid;';
                         }
-
+                        if (borderColor !== ''){
+                            style += 'border-color:'+borderColor+';';
+                        }
+                        style += 'table-layout: '+'fixed;';
 						var html = '<table';
 						if (style !== '') {
 							html += ' style="' + style + '"';
@@ -278,7 +283,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="border:solid windowtext 1.0px;" >' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+								html += '<td style="border:solid windowtext 1.0px;text-overflow:inherit;overflow: hidden;white-space: nowrap" >' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
 							}
 							html += '</tr>';
 						}