Skip to content

Commit

Permalink
Merge pull request #2146 from Incuuu/bug/mouse_over_mouse_out
Browse files Browse the repository at this point in the history
Add MouseEvent in mouse:over/mouse:out events
  • Loading branch information
kangax committed Apr 23, 2015
2 parents 6c92681 + 935fd4f commit 60486e1
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/canvas.class.js
Original file line number Diff line number Diff line change
Expand Up @@ -752,28 +752,28 @@
}

var target = this._searchPossibleTargets(e);
this._fireOverOutEvents(target);
this._fireOverOutEvents(target, e);

return target;
},

/**
* @private
*/
_fireOverOutEvents: function(target) {
_fireOverOutEvents: function(target, e) {
if (target) {
if (this._hoveredTarget !== target) {
this.fire('mouse:over', { target: target });
this.fire('mouse:over', { target: target, e: e });
target.fire('mouseover');
if (this._hoveredTarget) {
this.fire('mouse:out', { target: this._hoveredTarget });
this.fire('mouse:out', { target: this._hoveredTarget, e: e });
this._hoveredTarget.fire('mouseout');
}
this._hoveredTarget = target;
}
}
else if (this._hoveredTarget) {
this.fire('mouse:out', { target: this._hoveredTarget });
this.fire('mouse:out', { target: this._hoveredTarget, e: e });
this._hoveredTarget.fire('mouseout');
this._hoveredTarget = null;
}
Expand Down

0 comments on commit 60486e1

Please sign in to comment.