lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-04-05 20:48:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'benbenbenbenbenben-master'

Browse Source
This commit is contained in:
Anton Lavrenov 2017-03-24 08:48:36 -05:00
commit 4834f78347
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
konva.js
View File

@ -2,7 +2,7 @@
* Konva JavaScript Framework v1.5.0 * Konva JavaScript Framework v1.5.0
* http://konvajs.github.io/ * http://konvajs.github.io/
* Licensed under the MIT or GPL Version 2 licenses. * Licensed under the MIT or GPL Version 2 licenses.
* Date: Mon Mar 20 2017 * Date: Fri Mar 24 2017
* *
* Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS) * Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
* Modified work Copyright (C) 2014 - 2017 by Anton Lavrenov (Konva) * Modified work Copyright (C) 2014 - 2017 by Anton Lavrenov (Konva)
@ -10411,13 +10411,13 @@
if (evt.touches.length > 0) { if (evt.touches.length > 0) {
var touch = evt.touches[0]; var touch = evt.touches[0];
// get the information for finger #1 // get the information for finger #1
x = touch.clientX - contentPosition.left; x = touch.offsetX;
y = touch.clientY - contentPosition.top; y = touch.offsetY;
} }
} else { } else {
// mouse events // mouse events
x = evt.clientX - contentPosition.left; x = evt.offsetX;
y = evt.clientY - contentPosition.top; y = evt.offsetY;
} }
if (x !== null && y !== null) { if (x !== null && y !== null) {
this.pointerPos = { this.pointerPos = {

4
konva.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
src/Stage.js
View File

@ -705,13 +705,13 @@
if (evt.touches.length > 0) { if (evt.touches.length > 0) {
var touch = evt.touches[0]; var touch = evt.touches[0];
// get the information for finger #1 // get the information for finger #1
x = touch.clientX - contentPosition.left; x = touch.offsetX;
y = touch.clientY - contentPosition.top; y = touch.offsetY;
} }
} else { } else {
// mouse events // mouse events
x = evt.clientX - contentPosition.left; x = evt.offsetX;
y = evt.clientY - contentPosition.top; y = evt.offsetY;
} }
if (x !== null && y !== null) { if (x !== null && y !== null) {
this.pointerPos = { this.pointerPos = {