diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index d97f1cd2e..176e00ec8 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -3909,14 +3909,22 @@ _extend(KToolbar, KWidget, { }); }, get : function(name) { + //if(this._itemMap[name])return this._itemMap[name]; + //return this._itemMap[name]=K("span.ke-icon-"+name,this.div).parent() // if (this._itemMap[name]) { // return this._itemMap[name]; // } - if($("#define").css('display') == 'block'){ - pdiv = $("#define") - }else if($("#full").css('display') == 'block'){ - pdiv = $("#full") - } +// if($("#define").css('display') == 'block'){ +// pdiv = $("#define") +// }else if($("#full").css('display') == 'block'){ +// pdiv = $("#full") +// } + var container = this.div; + if(!$("#define",container).is(':hidden')){ + pdiv = $("#define",container); + }else if(!$("#full",container).is(':hidden')){ + pdiv = $("#full",container); + } return (this._itemMap[name] = K('span.ke-icon-' + name, pdiv).parent()); }, select : function(name) { @@ -4865,6 +4873,7 @@ KEditor.prototype = { }); return self; } + //if(name=='more')alert(fn); return self.handler(key, fn); }, updateState : function() { diff --git a/public/assets/kindeditor/plugins/less/less.js b/public/assets/kindeditor/plugins/less/less.js index b24d31723..12e8436bc 100644 --- a/public/assets/kindeditor/plugins/less/less.js +++ b/public/assets/kindeditor/plugins/less/less.js @@ -2,13 +2,16 @@ KindEditor.plugin('less', function(K) { var self = this, name = 'less'; self.plugin.less = { click : function(){ - if($("#define").css('display') == 'block'){ - $("#define").css('display','none') - $("#full").css('display','block') - }else if($("#full").css('display') == 'block'){ - $("#full").css('display','none') - $("#define").css('display','block') - } + var container = self.toolbar.div; + $("#full",container).hide(); + $("#define",container).show(); + //if($("#define").css('display') == 'block'){ + // $("#define").css('display','none') + // $("#full").css('display','block') + //}else if($("#full").css('display') == 'block'){ + // $("#full").css('display','none') + // $("#define").css('display','block') + //} } } self.clickToolbar(name,self.plugin.less.click) diff --git a/public/assets/kindeditor/plugins/more/more.js b/public/assets/kindeditor/plugins/more/more.js index 31eb8567f..03d7640ec 100644 --- a/public/assets/kindeditor/plugins/more/more.js +++ b/public/assets/kindeditor/plugins/more/more.js @@ -2,13 +2,16 @@ KindEditor.plugin('more', function(K) { var self = this, name = 'more'; self.plugin.more = { click : function(){ - if($("#define").css('display') == 'block'){ - $("#define").css('display','none') - $("#full").css('display','block') - }else if($("#full").css('display') == 'block'){ - $("#full").css('display','none') - $("#define").css('display','block') - } + var container = self.toolbar.div; + $("#define",container).hide(); + $("#full",container).show(); + //if($("#define").css('display') == 'block'){ + // $("#define").css('display','none') + // $("#full").css('display','block') + //}else if($("#full").css('display') == 'block'){ + // $("#full").css('display','none') + // $("#define").css('display','block') + //} } } self.clickToolbar(name,self.plugin.more.click)