Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Trigger mouse over on canvas enter #3389

Merged
merged 3 commits into from
Nov 1, 2016
Merged

Trigger mouse over on canvas enter #3389

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3cf82be
fire a mouse:over event once when mouse enters the canvas
stefanhayden Oct 31, 2016
ccfcc4f
only fire if we don't find a target
stefanhayden Oct 31, 2016
52cdf26
only fire if we find no target and set the hoveredTarget to null
stefanhayden Nov 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/mixins/canvas_events.mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
addListener(this.upperCanvasEl, 'mousedown', this._onMouseDown);
addListener(this.upperCanvasEl, 'mousemove', this._onMouseMove);
addListener(this.upperCanvasEl, 'mouseout', this._onMouseOut);
addListener(this.upperCanvasEl, 'mouseenter', this._onMouseEnter);
addListener(this.upperCanvasEl, 'wheel', this._onMouseWheel);
addListener(this.upperCanvasEl, 'contextmenu', this._onContextMenu);

Expand Down Expand Up @@ -75,6 +76,7 @@
this._onOrientationChange = this._onOrientationChange.bind(this);
this._onMouseWheel = this._onMouseWheel.bind(this);
this._onMouseOut = this._onMouseOut.bind(this);
this._onMouseEnter = this._onMouseEnter.bind(this);
this._onContextMenu = this._onContextMenu.bind(this);
},

Expand All @@ -87,6 +89,7 @@
removeListener(this.upperCanvasEl, 'mousedown', this._onMouseDown);
removeListener(this.upperCanvasEl, 'mousemove', this._onMouseMove);
removeListener(this.upperCanvasEl, 'mouseout', this._onMouseOut);
removeListener(this.upperCanvasEl, 'mouseenter', this._onMouseEnter);
removeListener(this.upperCanvasEl, 'wheel', this._onMouseWheel);
removeListener(this.upperCanvasEl, 'contextmenu', this._onContextMenu);

Expand Down Expand Up @@ -139,6 +142,19 @@
target && target.fire('mouseout', { e: e });
},

/**
* @private
* @param {Event} e Event object fired on mouseenter
*/
_onMouseEnter: function(e) {
if (!this.findTarget(e)) {
var target = this._hoveredTarget || null;
this.fire('mouse:over', { target: target, e: e });
this._hoveredTarget = null;
target && target.fire('mouseenter', { e: e });
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think mouseenter is our mouseover.

But beside that, if you do not find any target, this.findTarget(e) why do you want to fire the event for the last hoverdTarget ?

}
},

/**
* @private
* @param {Event} [e] Event object fired on Event.js orientation change
Expand Down