[Pkg-javascript-commits] [leaflet-markercluster] 66/479: Fix-Fix double childCount adding bug. Fix broken icon after add bug

[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 55d221c9e19769a97b54c5fdce5d3b097c7d87c7
Author: danzel <danzel at localhost.geek.nz>
Date:   Fri Jul 20 16:15:07 2012 +1200

    Fix-Fix double childCount adding bug. Fix broken icon after add bug
---
 src/MarkerCluster.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/MarkerCluster.js b/src/MarkerCluster.js
index e3d1abb..310acff 100644
--- a/src/MarkerCluster.js
+++ b/src/MarkerCluster.js
@@ -87,7 +87,6 @@ L.MarkerCluster = L.Marker.extend({
 		if (!this._haveGeneratedChildClusters && this._canAcceptPosition(layer.getLatLng(), zoom)) {
 			//Don't need to cluster it in as we haven't clustered
 			this._addChild(layer);
-			this._childCount++;
 			result = true;
 		} else {
 			for (var i = this._childClusters.length - 1; i >= 0; i--) {
@@ -119,9 +118,9 @@ L.MarkerCluster = L.Marker.extend({
 		}
 
 		if (result) {
-			//if (!this._zoom) { //TODO: Enable this when i've tracked the weird bug
+			if (!this._zoom) {
 				this.setIcon(this._group.options.iconCreateFunction(this._childCount));
-			//}
+			}
 			this._recalculateBounds();
 		}
 		if (result === true) {

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