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

Merge branch 'yuanke_youhua' into 'develop' 

KE工具栏不换行

KE工具栏不换行

See merge request !24
This commit is contained in:
黄井泉 2016-11-25 18:00:04 +08:00
parent 3c74bc7465 b6172fc31f
commit 735e38745e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5067,9 +5067,9 @@ KEditor.prototype = {
] ]
K.each(fullItems, function(i, name) { K.each(fullItems, function(i, name) {
if (name == '|') { if (name == '|') {
htmlListFull.push('<span class="ke-inline-block ke-separator"></span>'); // htmlListFull.push('<span class="ke-inline-block ke-separator"></span>');
} else if (name == '/') { } else if (name == '/') {
htmlListFull.push('<div class="ke-hr"></div>'); // htmlListFull.push('<div class="ke-hr"></div>');
} else { } else {
htmlListFull.push('<span class="ke-outline" data-name="' + name + '" title="' + self.lang(name) + '" unselectable="on">'); htmlListFull.push('<span class="ke-outline" data-name="' + name + '" title="' + self.lang(name) + '" unselectable="on">');
htmlListFull.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-' + name + '" unselectable="on"></span></span>'); htmlListFull.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-' + name + '" unselectable="on"></span></span>');