publish

dist/kityminder.all.js

 /*!
  * ====================================================
- * kityminder - v1.0.0 - 2014-03-08
+ * kityminder - v1.0.0 - 2014-03-10
  * https://github.com/fex-team/kityminder
  * GitHub: https://github.com/fex-team/kityminder.git 
  * Copyright (c) 2014 f-cube @ FEX; Licensed MIT
@@ -3555,6 +3555,7 @@ KityMinder.registerModule( 'Hand', function () {
             mousewheel: function ( e ) {
                 var dx, dy;
                 e = e.originEvent;
+                if(e.ctrlKey || e.shiftKey) return;
 
                 if ( 'wheelDeltaX' in e ) {
 
@@ -3575,7 +3576,7 @@ KityMinder.registerModule( 'Hand', function () {
 
                 e.preventDefault();
             },
-            dblclick: function ( e ) {
+            'normal.dblclick': function ( e ) {
                 if ( e.getTargetNode() ) return;
                 
                 var viewport = this.getPaper().getViewPort();
@@ -5027,7 +5028,7 @@ KityMinder.registerModule( "fontmodule", function () {
 
 KityMinder.registerModule( 'Zoom', function () {
 	var MAX_ZOOM = 2,
-		MIN_ZOOM = 0.5,
+		MIN_ZOOM = kity.Browser.chrome ? 1 : 0.5,
 		ZOOM_STEP = Math.sqrt( 2 );
 
 	function zoom( minder, rate ) {
@@ -5055,31 +5056,31 @@ KityMinder.registerModule( 'Zoom', function () {
 			}
 		} );
 
-		animator.start( paper, 100, 'ease' );
+		animator.start( paper, 500, 'ease' );
 		minder._zoomValue = zoomValue *= rate;
 	}
 
 	var ZoomInCommand = kity.createClass( 'ZoomInCommand', {
 		base: Command,
 		execute: function ( minder ) {
-			if( !this.queryState( minder ) ) {
+			if ( !this.queryState( minder ) ) {
 				zoom( minder, 1 / ZOOM_STEP );
 			}
 		},
 		queryState: function ( minder ) {
-			return (minder._zoomValue > MIN_ZOOM) ? 0 : -1;
+			return ( minder._zoomValue > 1 / MAX_ZOOM ) ? 0 : -1;
 		}
 	} );
 
 	var ZoomOutCommand = kity.createClass( 'ZoomOutCommand', {
 		base: Command,
 		execute: function ( minder ) {
-			if( !this.queryState( minder ) ) {
+			if ( !this.queryState( minder ) ) {
 				zoom( minder, ZOOM_STEP );
 			}
 		},
 		queryState: function ( minder ) {
-			return (minder._zoomValue < MAX_ZOOM) ? 0 : -1;
+			return ( minder._zoomValue < 1 / MIN_ZOOM ) ? 0 : -1;
 		}
 	} );
 
@@ -5091,26 +5092,30 @@ KityMinder.registerModule( 'Zoom', function () {
 
 
 		events: {
-            'normal.keydown':function(e){
-                var me = this;
-                var originEvent = e.originEvent;
-                var keyCode = originEvent.keyCode || originEvent.which;
-                if(keymap['='] == keyCode){
-                    me.execCommand('zoom-in');
-                }
-                if(keymap['-'] == keyCode){
-                    me.execCommand('zoom-out');
+			'normal.keydown': function ( e ) {
+				var me = this;
+				var originEvent = e.originEvent;
+				var keyCode = originEvent.keyCode || originEvent.which;
+				if ( keymap[ '=' ] == keyCode ) {
+					me.execCommand( 'zoom-in' );
+				}
+				if ( keymap[ '-' ] == keyCode ) {
+					me.execCommand( 'zoom-out' );
 
-                }
-            },
+				}
+			},
 			'ready': function () {
 				this._zoomValue = 1;
 			},
-			// disable mouse wheel
-			'mousewheel_': function ( e ) {
+			'normal.mousewheel': function ( e ) {
+				if ( !e.originEvent.ctrlKey ) return;
 				var delta = e.originEvent.wheelDelta;
 				var me = this;
 
+				if ( !kity.Browser.mac ) {
+					delta = -delta;
+				}
+
 				// 稀释
 				if ( Math.abs( delta ) > 100 ) {
 					clearTimeout( this._wheelZoomTimeout );
@@ -5122,9 +5127,9 @@ KityMinder.registerModule( 'Zoom', function () {
 					var value;
 					var lastValue = me.getPaper()._zoom || 1;
 					if ( delta < 0 ) {
-						me.execCommand('zoom-in');
+						me.execCommand( 'zoom-in' );
 					} else if ( delta > 0 ) {
-						me.execCommand('zoom-out');
+						me.execCommand( 'zoom-out' );
 					}
 				}, 100 );