lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-12-03 12:13:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

did further refactoring of event flag handling in stage

Browse Source
This commit is contained in:
Eric Rowell
2013-07-23 11:42:38 -07:00
parent 4f8bd0bd3f
commit e65b975a6a
1 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/Stage.js
View File

@@ -445,25 +445,20 @@
shape._fireAndBubble(MOUSEUP, evt);
// detect if click or double click occurred
if(go.listenClickTap) {
/*
* if dragging and dropping, or if click doesn't map to
* the correct shape, don't fire click or dbl click event
*/
if(!go.isDragging() && shape._id === this.clickStartShape._id) {
shape._fireAndBubble(CLICK, evt);
if(go.listenClickTap && shape._id === this.clickStartShape._id) {
shape._fireAndBubble(CLICK, evt);
if(go.inDblClickWindow) {
shape._fireAndBubble(DBL_CLICK, evt);
go.inDblClickWindow = false;
}
else {
go.inDblClickWindow = true;
}
setTimeout(function() {
go.inDblClickWindow = false;
}, go.dblClickWindow);
if(go.inDblClickWindow) {
shape._fireAndBubble(DBL_CLICK, evt);
go.inDblClickWindow = false;
}
else {
go.inDblClickWindow = true;
}
setTimeout(function() {
go.inDblClickWindow = false;
}, go.dblClickWindow);
}
go.listenClickTap = false;
@@ -499,25 +494,20 @@
shape._fireAndBubble(TOUCHEND, evt);
// detect if tap or double tap occurred
if(go.listenClickTap) {
/*
* if dragging and dropping, don't fire tap or dbltap
* event
*/
if(!go.isDragging() && shape._id === this.tapStartShape._id) {
shape._fireAndBubble(TAP, evt);
if(go.listenClickTap && shape._id === this.tapStartShape._id) {
shape._fireAndBubble(TAP, evt);
if(go.inDblClickWindow) {
shape._fireAndBubble(DBL_TAP, evt);
go.inDblClickWindow = false;
}
else {
go.inDblClickWindow = true;
}
setTimeout(function() {
go.inDblClickWindow = false;
}, go.dblClickWindow);
if(go.inDblClickWindow) {
shape._fireAndBubble(DBL_TAP, evt);
go.inDblClickWindow = false;
}
else {
go.inDblClickWindow = true;
}
setTimeout(function() {
go.inDblClickWindow = false;
}, go.dblClickWindow);
}
go.listenClickTap = false;