fix zoom in mac (#46)

* fix zoom in mac * reverse delta

fix zoom in mac (#46)
* fix zoom in mac * reverse delta
7aabc8d7 · Xingyu Xu · 马金花儿 · e63eefc8 · 7aabc8d7 · 7aabc8d7
Commit 7aabc8d7 authored Sep 20, 2018 by Xingyu Xu Committed by 马金花儿 Sep 20, 2018
Showing with 9 additions and 17 deletions

kityminder.core.js dist/kityminder.core.js +3 -6

kityminder.core.min.js dist/kityminder.core.min.js +2 -2

example.html example.html +2 -2

zoom.js src/module/zoom.js +2 -7

No files found.
--- a/dist/kityminder.core.js
+++ b/dist/kityminder.core.js
 /*!
 * ====================================================
- * 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);

--- a/dist/kityminder.core.min.js
+++ b/dist/kityminder.core.min.js
--- 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">


--- 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);