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

began refactoring layer getIntersection method and added unit tests

Browse Source
This commit is contained in:
Eric Rowell
2013-11-27 16:05:35 -08:00
parent 4d35d38c2d
commit bc9bd291fc
5 changed files with 82 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Stage.js
View File

@@ -358,7 +358,7 @@
obj = this.getIntersection(this.getPointerPosition()),
shape = obj && obj.shape ? obj.shape : undefined;
if(shape) {
if(shape && shape.isListening()) {
if(!Kinetic.isDragging() && obj.pixel[3] === 255 && (!this.targetShape || this.targetShape._id !== shape._id)) {
if(this.targetShape) {
this.targetShape._fireAndBubble(MOUSEOUT, evt, shape);
@@ -405,7 +405,7 @@
Kinetic.listenClickTap = true;
if (shape) {
if (shape && shape.isListening()) {
this.clickStartShape = shape;
shape._fireAndBubble(MOUSEDOWN, evt);
}
@@ -438,7 +438,7 @@
Kinetic.inDblClickWindow = false;
}, Kinetic.dblClickWindow);
if (shape) {
if (shape && shape.isListening()) {
shape._fireAndBubble(MOUSEUP, evt);
// detect if click or double click occurred
@@ -474,7 +474,7 @@
Kinetic.listenClickTap = true;
if (shape) {
if (shape && shape.isListening()) {
this.tapStartShape = shape;
shape._fireAndBubble(TOUCHSTART, evt);
@@ -505,7 +505,7 @@
Kinetic.inDblClickWindow = false;
}, Kinetic.dblClickWindow);
if (shape) {
if (shape && shape.isListening()) {
shape._fireAndBubble(TOUCHEND, evt);
// detect if tap or double tap occurred
@@ -537,7 +537,7 @@
obj = this.getIntersection(this.getPointerPosition()),
shape = obj && obj.shape ? obj.shape : undefined;
if (shape) {
if (shape && shape.isListening()) {
shape._fireAndBubble(TOUCHMOVE, evt);
// only call preventDefault if the shape is listening for events