[Pkg-javascript-commits] [leaflet-markercluster] 119/479: Update the build

[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 f995563c426c148213dbda75401976693beac8d1
Author: danzel <danzel at localhost.geek.nz>
Date:   Thu Jul 26 12:03:02 2012 +1200

    Update the build
---
 dist/leaflet.markercluster-src.js | 14 +++++++-------
 dist/leaflet.markercluster.js     |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dist/leaflet.markercluster-src.js b/dist/leaflet.markercluster-src.js
index 24076c0..b009c8c 100644
--- a/dist/leaflet.markercluster-src.js
+++ b/dist/leaflet.markercluster-src.js
@@ -150,7 +150,6 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
 	},
 
 	_zoomEnd: function () {
-		this._animationStart();
 
 		this._mergeSplitClusters();
 
@@ -159,7 +158,7 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
 	},
 
 	_moveEnd: function () {
-		if (this._inZoomAnimation > 0) {
+		if (this._inZoomAnimation) {
 			return;
 		}
 
@@ -197,14 +196,18 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
 	_mergeSplitClusters: function () {
 
 		if (this._zoom < this._map._zoom) { //Zoom in, split
+			this._animationStart();
 			//Remove clusters now off screen
 			this._topClusterLevel._recursivelyRemoveChildrenFromMap(this._currentShownBounds, this._zoom - this._topClusterLevel._zoom, this._getExpandedVisibleBounds());
 
 			this._animationZoomIn(this._zoom, this._map._zoom);
 
 		} else if (this._zoom > this._map._zoom) { //Zoom out, merge
+			this._animationStart();
 
 			this._animationZoomOut(this._zoom, this._map._zoom);
+		} else {
+			this._moveEnd();
 		}
 	},
 
@@ -350,6 +353,7 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
 	//Animated versions here
 	_animationStart: function () {
 		this._map._mapPane.className += ' leaflet-cluster-anim';
+		this._inZoomAnimation++;
 	},
 	_animationEnd: function () {
 		this._map._mapPane.className = this._map._mapPane.className.replace(' leaflet-cluster-anim', '');
@@ -409,8 +413,6 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
 			c._recursivelyRestoreChildPositions(depthToDescend);
 		});
 
-		this._inZoomAnimation++;
-
 		//Remove the old clusters and close the zoom animation
 		
 		setTimeout(function () {
@@ -438,8 +440,6 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
 		//Animate all of the markers in the clusters to move to their cluster center point
 		marker._recursivelyAnimateChildrenInAndAddSelfToMap(bounds, depthToStartAt, depthToAnimateIn);
 
-		this._inZoomAnimation++;
-
 		var me = this;
 
 		//Update the opacity (If we immediately set it they won't animate)
@@ -493,7 +493,6 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
 		//Could loop all this._layers and do this for each _icon if it stops working
 
 		L.Util.falseFn(document.body.offsetWidth);
-
 	}
 });
 
@@ -1317,6 +1316,7 @@ L.MarkerCluster.include(!L.DomUtil.TRANSITION ? {
 				map.removeLayer(m._spiderLeg);
 				delete m._spiderLeg;
 			}
+			group._animationEnd();
 		}, 250);
 	}
 });
diff --git a/dist/leaflet.markercluster.js b/dist/leaflet.markercluster.js
index 8369177..8e1a623 100644
--- a/dist/leaflet.markercluster.js
+++ b/dist/leaflet.markercluster.js
@@ -3,4 +3,4 @@
  Leaflet.markercluster is an open-source JavaScript library for Marker Clustering on leaflet powered maps.
  https://github.com/danzel/Leaflet.markercluster
 */
-(function(e,t){L.MarkerClusterGroup=L.FeatureGroup.extend({options:{maxClusterRadius:60,iconCreateFunction:null,spiderfyOnMaxZoom:!0,showCoverageOnHover:!0,zoomToBoundsOnClick:!0},initialize:function(e){L.Util.setOptions(this,e),this.options.iconCreateFunction||(this.options.iconCreateFunction=this._defaultIconCreateFunction),L.FeatureGroup.prototype.initialize.call(this,[]),this._inZoomAnimation=0,this._needsClustering=[],this._currentShownBounds=null},addLayer:function(e){if(!this._map [...]
\ No newline at end of file
+(function(e,t){L.MarkerClusterGroup=L.FeatureGroup.extend({options:{maxClusterRadius:60,iconCreateFunction:null,spiderfyOnMaxZoom:!0,showCoverageOnHover:!0,zoomToBoundsOnClick:!0},initialize:function(e){L.Util.setOptions(this,e),this.options.iconCreateFunction||(this.options.iconCreateFunction=this._defaultIconCreateFunction),L.FeatureGroup.prototype.initialize.call(this,[]),this._inZoomAnimation=0,this._needsClustering=[],this._currentShownBounds=null},addLayer:function(e){if(!this._map [...]
\ No newline at end of file

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