From 27263b7afaf79f85fb0b056d96388f9f8eed87c2 Mon Sep 17 00:00:00 2001
From: Dave Leaver <danzel@localhost.geek.nz>
Date: Wed, 29 Mar 2017 10:10:29 +1300
Subject: [PATCH] Control.Layers: Only add layer events to layers when we are
 on the map. Fixes #5421 (#5422)

---
 spec/suites/control/Control.LayersSpec.js | 31 +++++++++++++++++++++++
 src/control/Control.Layers.js             |  8 +++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/spec/suites/control/Control.LayersSpec.js b/spec/suites/control/Control.LayersSpec.js
index 977bf6a5..36a921f4 100644
--- a/spec/suites/control/Control.LayersSpec.js
+++ b/spec/suites/control/Control.LayersSpec.js
@@ -29,6 +29,26 @@ describe("Control.Layers", function () {
 			expect(spy.args[1][0].layer).to.be(baseLayers["Layer 2"]);
 		});
 
+		it("works after removing and readding the Control.Layers to the map", function () {
+			var baseLayers = {"Layer 1": L.tileLayer(''), "Layer 2": L.tileLayer('')},
+			    layers = L.control.layers(baseLayers).addTo(map),
+			    spy = sinon.spy();
+
+			map.on('baselayerchange', spy);
+
+			map.removeControl(layers);
+			map.addControl(layers);
+
+			happen.click(layers._baseLayersList.getElementsByTagName("input")[0]);
+			expect(spy.called).to.be.ok();
+			expect(spy.args[0][0].name).to.be("Layer 1");
+			expect(spy.args[0][0].layer).to.be(baseLayers["Layer 1"]);
+			happen.click(layers._baseLayersList.getElementsByTagName("input")[1]);
+			expect(spy.calledTwice).to.be.ok();
+			expect(spy.args[1][0].name).to.be("Layer 2");
+			expect(spy.args[1][0].layer).to.be(baseLayers["Layer 2"]);
+		});
+
 		it("is not fired on input that doesn't change the base layer", function () {
 			var overlays = {"Marker 1": L.marker([0, 0]), "Marker 2": L.marker([0, 0])},
 			    layers = L.control.layers({}, overlays).addTo(map),
@@ -126,6 +146,17 @@ describe("Control.Layers", function () {
 				map.removeLayer(baseLayer);
 			}).to.not.throwException();
 		});
+
+		it("and layers in the control can still be removed when added after removing control from map", function () {
+			var baseLayer = L.tileLayer('').addTo(map);
+			var layersCtrl = L.control.layers().addTo(map);
+			map.removeControl(layersCtrl);
+			layersCtrl.addBaseLayer(baseLayer, 'Base');
+
+			expect(function () {
+				map.removeLayer(baseLayer);
+			}).to.not.throwException();
+		});
 	});
 
 	describe("is created with an expand link", function ()  {
diff --git a/src/control/Control.Layers.js b/src/control/Control.Layers.js
index 7cb53ff6..a396ba6c 100644
--- a/src/control/Control.Layers.js
+++ b/src/control/Control.Layers.js
@@ -100,6 +100,10 @@ export var Layers = Control.extend({
 		this._map = map;
 		map.on('zoomend', this._checkDisabledLayers, this);
 
+		for (var i = 0; i < this._layers.length; i++) {
+			this._layers[i].layer.on('add remove', this._onLayerChange, this);
+		}
+
 		return this._container;
 	},
 
@@ -229,7 +233,9 @@ export var Layers = Control.extend({
 	},
 
 	_addLayer: function (layer, name, overlay) {
-		layer.on('add remove', this._onLayerChange, this);
+		if (this._map) {
+			layer.on('add remove', this._onLayerChange, this);
+		}
 
 		this._layers.push({
 			layer: layer,