fix zoom in mac (fex-team#46)

* fix zoom in mac * reverse delta
dongggcom · Sep 20, 2018 · 7aabc8d · 7aabc8d
1 parent e63eefc
commit 7aabc8d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/dist/kityminder.core.js b/dist/kityminder.core.js
@@ -1,6 +1,6 @@
 /*!
  * ====================================================
- * Kity Minder Core - v1.4.49 - 2018-04-02
+ * Kity Minder Core - v1.4.50 - 2018-09-17
  * https://github.com/fex-team/kityminder-core
  * GitHub: https://github.com/fex-team/kityminder-core.git 
  * Copyright (c) 2018 Baidu FEX; Licensed BSD-3-Clause
@@ -7949,9 +7949,6 @@ _p[63] = {
                         if (!e.originEvent.ctrlKey && !e.originEvent.metaKey) return;
                         var delta = e.originEvent.wheelDelta;
                         var me = this;
-                        if (!kity.Browser.mac) {
-                            delta = -delta;
-                        }
                         // 稀释
                         if (Math.abs(delta) > 100) {
                             clearTimeout(this._wheelZoomTimeout);
@@ -7961,9 +7958,9 @@ _p[63] = {
                         this._wheelZoomTimeout = setTimeout(function() {
                             var value;
                             var lastValue = me.getPaper()._zoom || 1;
-                            if (delta < 0) {
+                            if (delta > 0) {
                                 me.execCommand("zoomin");
-                            } else if (delta > 0) {
+                            } else if (delta < 0) {
                                 me.execCommand("zoomout");
                             }
                         }, 100);

diff --git a/dist/kityminder.core.min.js b/dist/kityminder.core.min.js
diff --git a/example.html b/example.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>KityMinder Example</title>
-
+    <meta name="viewport" content="initial-scale=1.0, user-scalable=no" >
     <link href="favicon.ico" type="image/x-icon" rel="shortcut icon">
     <link rel="stylesheet" href="src/kityminder.css" rel="stylesheet">
 
@@ -62,4 +62,4 @@
     km.execCommand('hand');
 </script>
 
-</html>
+</html>
diff --git a/src/module/zoom.js b/src/module/zoom.js
@@ -165,11 +165,6 @@ define(function(require, exports, module) {
 
                     var delta = e.originEvent.wheelDelta;
                     var me = this;
-
-                    if (!kity.Browser.mac) {
-                        delta = -delta;
-                    }
-
                     // 稀释
                     if (Math.abs(delta) > 100) {
                         clearTimeout(this._wheelZoomTimeout);
@@ -180,9 +175,9 @@ define(function(require, exports, module) {
                     this._wheelZoomTimeout = setTimeout(function() {
                         var value;
                         var lastValue = me.getPaper()._zoom || 1;
-                        if (delta < 0) {
+                        if (delta > 0) {
                             me.execCommand('zoomin');
-                        } else if (delta > 0) {
+                        } else if (delta < 0) {
                             me.execCommand('zoomout');
                         }
                     }, 100);