VladPolskiy/leaflet
1
0
Fork 0
mirror of https://github.com/Leaflet/Leaflet.git synced 2025-08-16 16:45:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Ignore events if Draggable is disabled, fixing disabling drag on click in IE11 (#4479)

Browse Source 
* Ingore events if Draggable is disabled
Close #3666.

* Add test for verifying fix to #3666
This commit is contained in:
Per Liedman
2016-06-28 01:16:03 +02:00
committed by Vladimir Agafonkin
parent bddfb1168f
commit 01790eacda
2 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
spec/suites/map/handler/Map.DragSpec.js
View File

@ -113,6 +113,48 @@ describe("Map.Drag", function () {
mouse.wait(100).moveTo(200, 200, 0)
.down().moveBy(1, 0, 20).moveBy(1, 0, 200).up();
});
it("does not change the center of the map when drag is disabled on click", function (done) {
var container = document.createElement('div');
container.style.width = container.style.height = '600px';
container.style.top = container.style.left = 0;
container.style.position = 'absolute';
document.body.appendChild(container);
var map = new L.Map(container, {
dragging: true,
inertia: false
});
var originalCenter = L.latLng(0, 0);
map.setView(originalCenter, 1);
map.on('mousedown', function () {
map.dragging.disable();
});
var spy = sinon.spy();
map.on('drag', spy);
var hand = new Hand({
timing: 'fastframe',
onStop: function () {
var center = map.getCenter();
var zoom = map.getZoom();
document.body.removeChild(container);
expect(center).to.be(originalCenter); // Expect center point to be the same as before the click
expect(spy.callCount).to.eql(0); // No drag event should have been fired.
expect(zoom).to.be(1);
done();
}
});
var mouse = hand.growFinger('mouse');
// We move 5 pixels first to overcome the 3-pixel threshold of
// L.Draggable.
mouse.wait(100).moveTo(200, 200, 0)
.down().moveBy(5, 0, 20).moveBy(256, 32, 200).up();
});
});
describe("touch events", function () {
@ -249,7 +291,6 @@ describe("Map.Drag", function () {
.down().moveBy(210, 0, 1000).up(200);
});
});
});

12
src/dom/Draggable.js
View File

@ -72,7 +72,9 @@ L.Draggable = L.Evented.extend({
// Ignore simulated events, since we handle both touch and
// mouse explicitly; otherwise we risk getting duplicates of
// touch events, see #4315.
if (e._simulated) { return; }
// Also ignore the event if disabled; this happens in IE11
// under some circumstances, see #3666.
if (e._simulated || !this._enabled) { return; }
this._moved = false;
@ -107,7 +109,9 @@ L.Draggable = L.Evented.extend({
// Ignore simulated events, since we handle both touch and
// mouse explicitly; otherwise we risk getting duplicates of
// touch events, see #4315.
if (e._simulated) { return; }
// Also ignore the event if disabled; this happens in IE11
// under some circumstances, see #3666.
if (e._simulated || !this._enabled) { return; }
if (e.touches && e.touches.length > 1) {
this._moved = true;
@ -168,7 +172,9 @@ L.Draggable = L.Evented.extend({
// Ignore simulated events, since we handle both touch and
// mouse explicitly; otherwise we risk getting duplicates of
// touch events, see #4315.
if (e._simulated) { return; }
// Also ignore the event if disabled; this happens in IE11
// under some circumstances, see #3666.
if (e._simulated || !this._enabled) { return; }
L.DomUtil.removeClass(document.body, 'leaflet-dragging');