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

Close non permanent tooltip on map click on touch (fix #4741)

Browse Source
This commit is contained in:
Yohan Boniface 2016-07-30 18:20:46 +02:00
parent 71d3bc02e5
commit a0ee68558f
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spec/suites/layer/TooltipSpec.js
View File

@ -253,5 +253,30 @@ describe('Tooltip', function () {
expect(map.hasLayer(layer._tooltip)).to.be(true);
});
it("is opened when tapping on touch", function () {
var oldTouch = L.Browser.touch;
L.Browser.touch = true;
var layer = new L.Marker(center).addTo(map);
layer.bindTooltip('Tooltip');
expect(map.hasLayer(layer._tooltip)).to.be(false);
happen.click(layer._icon);
expect(map.hasLayer(layer._tooltip)).to.be(true);
L.Browser.touch = oldTouch;
});
it("is closed if not permanent when clicking on the map elsewhere on touch", function () {
var oldTouch = L.Browser.touch;
L.Browser.touch = true;
var layer = new L.Marker(center).addTo(map);
layer.bindTooltip('Tooltip');
happen.click(layer._icon);
expect(map.hasLayer(layer._tooltip)).to.be(true);
happen.click(map._container);
expect(map.hasLayer(layer._tooltip)).to.be(false);
L.Browser.touch = oldTouch;
});
});

10
src/layer/Tooltip.js
View File

@ -94,6 +94,16 @@ L.Tooltip = L.DivOverlay.extend({
}
},
getEvents: function () {
var events = L.DivOverlay.prototype.getEvents.call(this);
if (L.Browser.touch && !this.options.permanent) {
events.preclick = this._close;
}
return events;
},
_close: function () {
if (this._map) {
this._map.closeTooltip(this);