[Pkg-javascript-commits] [leaflet-markercluster] 40/219: Bug fix + test for 6dc3

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository leaflet-markercluster.

commit 129cdf60e70793aa9431dcf4634bba507a8479e7
Author: Adrien Grsmto <grsmto at gmail.com>
Date:   Tue May 20 15:54:46 2014 +0200

    Bug fix + test for 6dc3
---
 spec/suites/removeLayersSpec.js | 7 +++++++
 src/MarkerClusterGroup.js       | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/spec/suites/removeLayersSpec.js b/spec/suites/removeLayersSpec.js
index 0ff840a..8f24ecf 100644
--- a/spec/suites/removeLayersSpec.js
+++ b/spec/suites/removeLayersSpec.js
@@ -57,6 +57,9 @@
 
 		markers[0].__parent.spiderfy();
 
+		// We must wait for the spiderfy animation to timeout
+		clock.tick(200);
+
 		group.removeLayers(markers);
 
 		expect(group.hasLayer(markers[0])).to.be(false);
@@ -64,5 +67,9 @@
 		expect(group.hasLayer(markers[2])).to.be(false);
 
 		expect(group.getLayers().length).to.be(0);
+
+		group.on('spiderfied', function() {
+			expect(group._spiderfied).to.be(null);
+		});
 	});
 });
\ No newline at end of file
diff --git a/src/MarkerClusterGroup.js b/src/MarkerClusterGroup.js
index ac5add8..1cadda3 100644
--- a/src/MarkerClusterGroup.js
+++ b/src/MarkerClusterGroup.js
@@ -251,6 +251,10 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
 			fg = this._featureGroup,
 			npg = this._nonPointGroup;
 
+		if (this._unspiderfy) {
+			this._unspiderfy();
+		}
+
 		if (!this._map) {
 			for (i = 0, l = layersArray.length; i < l; i++) {
 				m = layersArray[i];

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/leaflet-markercluster.git