From 01790eacda23fe0b33f43c0b8ecdbdced9d27df5 Mon Sep 17 00:00:00 2001
From: Per Liedman <per@liedman.net>
Date: Tue, 28 Jun 2016 01:16:03 +0200
Subject: [PATCH] Ignore events if Draggable is disabled, fixing disabling drag
 on click in IE11 (#4479)

* Ingore events if Draggable is disabled
Close #3666.

* Add test for verifying fix to #3666
---
 spec/suites/map/handler/Map.DragSpec.js | 43 ++++++++++++++++++++++++-
 src/dom/Draggable.js                    | 12 +++++--
 2 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/spec/suites/map/handler/Map.DragSpec.js b/spec/suites/map/handler/Map.DragSpec.js
index b77d24839..eab9cdeda 100644
--- a/spec/suites/map/handler/Map.DragSpec.js
+++ b/spec/suites/map/handler/Map.DragSpec.js
@@ -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);
 
 		});
-
 	});
 
 });
diff --git a/src/dom/Draggable.js b/src/dom/Draggable.js
index ce2150869..e1a7a2d85 100644
--- a/src/dom/Draggable.js
+++ b/src/dom/Draggable.js
@@ -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');