Merge branch 'szzh' into dev_hjq

public/assets/kindeditor/kindeditor.js

@@ -3909,13 +3909,21 @@ _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());
 	},
@@ -4865,6 +4873,7 @@ KEditor.prototype = {
 			});
 			return self;
 		}
+		//if(name=='more')alert(fn);
 		return self.handler(key, fn);
 	},
 	updateState : function() {

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)

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)