Update the build

This commit is contained in:
danzel
2012-07-26 12:03:02 +12:00
parent 9ade8eb10b
commit f995563c42
2 changed files with 8 additions and 8 deletions
+7 -7
View File
@@ -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);
}
});
+1 -1
View File
File diff suppressed because one or more lines are too long