lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2026-01-09 11:34:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

issue #606 moved evt.layerX/Y check at the end of the double pipe chain

Browse Source
This commit is contained in:
Eric Rowell
2013-09-25 09:55:12 -07:00
parent 6e8a5b74b9
commit 8105edca62
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Stage.js
View File

@@ -576,9 +576,15 @@
}
},
_setMousePosition: function(evt) {
var mouseX = evt.offsetX !== undefined ? evt.offsetX : evt.layerX || (evt.clientX - this._getContentPosition().left),
mouseY = evt.offsetY !== undefined ? evt.offsetY : evt.layerY || (evt.clientY - this._getContentPosition().top);
var contentPosition = this._getContentPosition(),
mouseX = evt.offsetX
|| ((evt.clientX || 0) - contentPosition.left)
|| evt.layerX
|| 0,
mouseY = evt.offsetY
|| ((evt.clientY || 0) - contentPosition.top)
|| evt.layerY
|| 0;
this.mousePos = {
x: mouseX,
@@ -586,15 +592,16 @@
};
},
_setTouchPosition: function(evt) {
var touch, touchX, touchY;
var contentPosition = this._getContentPosition(),
touch, touchX, touchY;
if(evt.touches !== undefined && evt.touches.length === 1) {
// one finger
touch = evt.touches[0];
// get the information for finger #1
touchX = touch.clientX - this._getContentPosition().left;
touchY = touch.clientY - this._getContentPosition().top;
touchX = touch.clientX - contentPosition.left;
touchY = touch.clientY - contentPosition.top;
this.touchPos = {
x: touchX,