Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

src/adapter/combobox.js

@@ -151,7 +151,10 @@ KM.registerUI( 'forecolor', function ( name ) {
         name: name,
         title: this.getLang( 'tooltips' )[ name ] || '',
         click: function () {
-            me.execCommand( name, getCurrentColor() );
+            var color =   kity.Color.parse(getCurrentColor()).toHEX();
+            if(!color == '#000000'){
+                me.execCommand( name, color );
+            }
         }
     } );
 

src/module/editor.js

@@ -27,7 +27,7 @@ KityMinder.registerModule( "TextEditModule", function () {
                     var textShape = node.getTextShape();
                     textShape.setStyle('cursor','default');
 
-                    if ( node.isSelected() ) {
+                    if ( this.isSingleSelect() && node.isSelected() ) {
 
                         sel.collapse();
                         node.getTextShape().setStyle('cursor','text');

src/module/select.js

@@ -87,7 +87,13 @@ KityMinder.registerModule( "Select", function () {
                 }
             },
             mousemove: marqueeActivator.selectMove,
-            mouseup: marqueeActivator.selectEnd
+            mouseup: function ( e ) {
+                var clickNode = e.getTargetNode();
+                if ( clickNode && clickNode.isSelected() && !this.isSingleSelect() ) {
+                    this.select( clickNode, true );
+                }
+                marqueeActivator.selectEnd( e );
+            }
         }
     };
 } );
\ No newline at end of file

src/module/zoom.js

 KityMinder.registerModule( 'Zoom', function () {
-
+	/*
 	return {
 		events: {
 			'mousewheel': function ( e ) {
@@ -18,5 +18,6 @@ KityMinder.registerModule( 'Zoom', function () {
 				this._zoom = 1;
 			}
 		}
-	};
+	};*/
+	return {};
 } );
\ No newline at end of file