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

Merge pull request #3692 from Leaflet/dragging-while-zooming

Browse Source 
Do not set draggable flags during a zoom animation
This commit is contained in:
Vladimir Agafonkin 2015-07-30 12:15:15 +03:00
commit 5a29499834
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dom/Draggable.js
View File

@ -46,6 +46,8 @@ L.Draggable = L.Evented.extend({
_onDown: function (e) { _onDown: function (e) {
this._moved = false; this._moved = false;
if (L.DomUtil.hasClass(this._element, 'leaflet-zoom-anim')) { return; }
if (L.Draggable._dragging || e.shiftKey || ((e.which !== 1) && (e.button !== 1) && !e.touches) || !this._enabled) { return; } if (L.Draggable._dragging || e.shiftKey || ((e.which !== 1) && (e.button !== 1) && !e.touches) || !this._enabled) { return; }
L.Draggable._dragging = true; // Prevent dragging multiple objects at once. L.Draggable._dragging = true; // Prevent dragging multiple objects at once.
@ -53,8 +55,6 @@ L.Draggable = L.Evented.extend({
L.DomUtil.preventOutline(this._element); L.DomUtil.preventOutline(this._element);
} }
if (L.DomUtil.hasClass(this._element, 'leaflet-zoom-anim')) { return; }
L.DomUtil.disableImageDrag(); L.DomUtil.disableImageDrag();
L.DomUtil.disableTextSelection(); L.DomUtil.disableTextSelection();