[Pkg-javascript-commits] [leaflet-markercluster] 122/479: Don't spiderfy/unspiderfy while a zoom is going on

[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 f53b11d0ea284e869f6941df2b6d57fbb31e23d2
Author: danzel <danzel at localhost.geek.nz>
Date:   Fri Jul 27 13:59:46 2012 +1200

    Don't spiderfy/unspiderfy while a zoom is going on
---
 src/MarkerCluster.Spiderfier.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/MarkerCluster.Spiderfier.js b/src/MarkerCluster.Spiderfier.js
index 74da499..cbc3b53 100644
--- a/src/MarkerCluster.Spiderfier.js
+++ b/src/MarkerCluster.Spiderfier.js
@@ -15,7 +15,7 @@ L.MarkerCluster.include({
 								// 0 -> always spiral; Infinity -> always circle
 
 	spiderfy: function () {
-		if (this._group._spiderfied === this) {
+		if (this._group._spiderfied === this || this._group._inZoomAnimation) {
 			return;
 		}
 
@@ -41,7 +41,9 @@ L.MarkerCluster.include({
 	},
 
 	unspiderfy: function () {
-
+		if (this._group._inZoomAnimation) {
+			return;
+		}
 		this._animationUnspiderfy();
 
 		this._group._spiderfied = null;

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