cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure mouseout for previous hovered layer before mouseover for new (#5090)

Browse Source 
Close #5082
This commit is contained in:
Per Liedman 2016-11-11 12:04:03 +01:00 committed by Iván Sánchez Ortega
parent 8c22c4e385
commit a4bbec5924
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/layer/vector/Canvas.js
View File

@ -270,14 +270,13 @@ L.Canvas = L.Renderer.extend({
if (!this._map || this._map.dragging.moving() || this._map._animatingZoom) { return; }
var point = this._map.mouseEventToLayerPoint(e);
this._handleMouseOut(e, point);
this._handleMouseHover(e, point);
},
_handleMouseOut: function (e, point) {
_handleMouseOut: function (e) {
var layer = this._hoveredLayer;
if (layer && (e.type === 'mouseout' || !layer._containsPoint(point))) {
if (layer) {
// if we're leaving the layer, fire mouseout
L.DomUtil.removeClass(this._container, 'leaflet-interactive');
this._fireEvent([layer], e, 'mouseout');
@ -295,10 +294,14 @@ L.Canvas = L.Renderer.extend({
}
}
if (candidateHoveredLayer && candidateHoveredLayer !== this._hoveredLayer) {
L.DomUtil.addClass(this._container, 'leaflet-interactive'); // change cursor
this._fireEvent([candidateHoveredLayer], e, 'mouseover');
this._hoveredLayer = candidateHoveredLayer;
if (candidateHoveredLayer !== this._hoveredLayer) {
this._handleMouseOut(e);
if (candidateHoveredLayer) {
L.DomUtil.addClass(this._container, 'leaflet-interactive'); // change cursor
this._fireEvent([candidateHoveredLayer], e, 'mouseover');
this._hoveredLayer = candidateHoveredLayer;
}
}
if (this._hoveredLayer) {