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

Merge branch 'yuanke' into develop

This commit is contained in:
huang 2016-05-13 15:25:04 +08:00
parent f1c0347ee2 a67ee38ac9
commit 1cd74121ae
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

9
public/assets/kindeditor/pasteimg.js
View File

@ -416,11 +416,10 @@ 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;
}
}