Fixing issue #543 - mouseout should fire before mouseover

A mouseout event for the current node should be fired before another node fires its mouseover event.
This commit is contained in:
Elliot Chong 2013-08-06 20:35:44 -07:00
parent 992be5dd2e
commit 3f2e7b88be

View File

@ -370,12 +370,12 @@
shape = obj.shape; shape = obj.shape;
if(shape) { if(shape) {
if(!go.isDragging() && obj.pixel[3] === 255 && (!this.targetShape || this.targetShape._id !== shape._id)) { if(!go.isDragging() && obj.pixel[3] === 255 && (!this.targetShape || this.targetShape._id !== shape._id)) {
shape._fireAndBubble(MOUSEOVER, evt, this.targetShape);
shape._fireAndBubble(MOUSEENTER, evt, this.targetShape);
if(this.targetShape) { if(this.targetShape) {
this.targetShape._fireAndBubble(MOUSEOUT, evt, shape); this.targetShape._fireAndBubble(MOUSEOUT, evt, shape);
this.targetShape._fireAndBubble(MOUSELEAVE, evt, shape); this.targetShape._fireAndBubble(MOUSELEAVE, evt, shape);
} }
shape._fireAndBubble(MOUSEOVER, evt, this.targetShape);
shape._fireAndBubble(MOUSEENTER, evt, this.targetShape);
this.targetShape = shape; this.targetShape = shape;
} }
else { else {