lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-09-21 04:27:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

currentTarget fix

Browse Source
This commit is contained in:
Anton Lavrenov
2016-01-04 08:24:27 +08:00
parent 7f2315fb1d
commit 2e76cfba30
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Node.js
View File

@@ -1326,9 +1326,9 @@
* node.fire('click', null, true);
*/
fire: function(eventType, evt, bubble) {
evt = evt || {};
evt.target = evt.target || this;
// bubble
evt = Konva.Util.cloneObject(evt || {});
evt.currentTarget = this;
if (bubble) {
this._fireAndBubble(eventType, evt);
}
@@ -1768,7 +1768,7 @@
// simulate event bubbling
var stopBubble = (eventType === MOUSEENTER || eventType === MOUSELEAVE) && ((compareShape && compareShape.isAncestorOf && compareShape.isAncestorOf(this)) || !!(compareShape && compareShape.isAncestorOf));
if(evt && !evt.cancelBubble && this.parent && this.parent.isListening() && (!stopBubble)) {
if((evt && !evt.cancelBubble || !evt) && this.parent && this.parent.isListening() && (!stopBubble)) {
if(compareShape && compareShape.parent) {
this._fireAndBubble.call(this.parent, eventType, evt, compareShape.parent);
}
@@ -1782,6 +1782,8 @@
var events = this.eventListeners[eventType],
i;
evt = Konva.Util.cloneObject(evt || {});
evt.currentTarget = this;
evt.type = eventType;
if (events) {