jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1.设置表格边框后所有的表格线宽度都一样 

2.KE改变字体后再点击字体会标明当前的字体
This commit is contained in:
yuanke 2016-05-25 10:34:09 +08:00
parent 9e8411aac9
commit 46860a838b
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/assets/kindeditor/kindeditor.js
View File

@ -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 = '';

6
public/assets/kindeditor/plugins/code/previewcode.css
View File

@ -1,7 +1,7 @@
.ke-content {
font-size: 12px;
font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: ΢<EFBFBD><EFBFBD><EFBFBD>ź<EFBFBD>, <EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
font-family:Tahoma;
font-size: 14px;
/*font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;*/
font-family: "微软雅黑","宋体";
}
.ke-content pre {
font-size:9pt;

3
public/assets/kindeditor/plugins/table/table.js
View File

@ -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>';
}