From 98a601f177d6ef51f5371165b7120fbc9c4857f0 Mon Sep 17 00:00:00 2001 From: Vitaliy Stoliarov Date: Wed, 29 Aug 2018 21:55:45 +0300 Subject: [PATCH] v1.0.0-alpha.9, fix zooming when container placed not at the top of page --- package-lock.json | 2 +- package.json | 2 +- src/view/zoom.js | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 08ac8667..db3109a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "rete", - "version": "1.0.0-alpha.8", + "version": "1.0.0-alpha.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 731e6a08..2cb23e77 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rete", - "version": "1.0.0-alpha.8", + "version": "1.0.0-alpha.9", "description": "JavaScript framework", "main": "build/rete.min.js", "types": "src/index.d.ts", diff --git a/src/view/zoom.js b/src/view/zoom.js index 57a528ee..50936e1d 100644 --- a/src/view/zoom.js +++ b/src/view/zoom.js @@ -19,16 +19,16 @@ export class Zoom { var rect = this.el.getBoundingClientRect(); var delta = (e.wheelDelta ? e.wheelDelta / 120 : - e.deltaY / 3) * this.intensity; - var ox = (rect.left - e.pageX) * delta; - var oy = (rect.top - e.pageY) * delta; + var ox = (rect.left - e.clientX) * delta; + var oy = (rect.top - e.clientY) * delta; this.onzoom(delta, ox, oy); } touches(e) { - let [x1, y1] = [e.touches[0].pageX, e.touches[0].pageY]; - let [x2, y2] = [e.touches[1].pageX, e.touches[1].pageY]; + let [x1, y1] = [e.touches[0].clientX, e.touches[0].clientY]; + let [x2, y2] = [e.touches[1].clientX, e.touches[1].clientY]; let distance = Math.sqrt(Math.pow(x1 - x2, 2) + Math.pow(y1 - y2, 2)); return {