[Pkg-javascript-commits] [leaflet-markercluster] 103/479: Make the built version work and use it for some of the samples

Thu Oct 16 16:00:15 UTC 2014

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

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

commit 9a650502bec1f0cce42a913cf3ea6650f04f7915
Author: danzel <danzel at localhost.geek.nz>
Date:   Wed Jul 25 10:53:27 2012 +1200

    Make the built version work and use it for some of the samples
---
 build/deps.js                             | 13 ++++++-------
 example/marker-clustering-everything.html |  6 +-----
 example/marker-clustering-realworld.html  |  6 +-----
 src/MarkerClusterGroup.js                 |  2 +-
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/build/deps.js b/build/deps.js
index be2f9e0..f1dfda9 100644
--- a/build/deps.js
+++ b/build/deps.js
@@ -1,4 +1,10 @@
 var deps = {
+	
+	Defaults: {
+		src: ['MarkerCluster.Default.js'],
+		deps: ['QuickHull', 'Spiderfier'],
+		desc: 'Provides sensible defaults for the Cluster.'
+	},
 	Core: {
 		src: ['MarkerClusterGroup.js',
 		      'MarkerCluster.js'],
@@ -15,13 +21,6 @@ var deps = {
 		src: ['MarkerCluster.Spiderfier.js'],
 		desc: 'Provides the ability to show all of the child markers of a cluster.',
 		heading: 'Spiderfier'
-	},
-
-	Defaults: {
-		src: ['MarkerCluster.Default.js'],
-		deps: ['QuickHull', 'Spiderfier'],
-		desc: 'Provides sensible defaults for the Cluster.',
-		heading: 'Sensible Defaults'
 	}
 };
 
diff --git a/example/marker-clustering-everything.html b/example/marker-clustering-everything.html
index b1ca510..dc00c21 100644
--- a/example/marker-clustering-everything.html
+++ b/example/marker-clustering-everything.html
@@ -12,11 +12,7 @@
 
 	<link rel="stylesheet" href="../dist/MarkerCluster.css" />
 	<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
-	<script src="../src/MarkerCluster.Default.js"></script>
-	<script src="../src/MarkerClusterGroup.js"></script>
-	<script src="../src/MarkerCluster.js"></script>
-	<script src="../src/MarkerCluster.QuickHull.js"></script>
-	<script src="../src/MarkerCluster.Spiderfier.js"></script>
+	<script src="../dist/leaflet.markercluster-src.js"></script>
 </head>
 <body>
 
diff --git a/example/marker-clustering-realworld.html b/example/marker-clustering-realworld.html
index 22502d6..60b2b47 100644
--- a/example/marker-clustering-realworld.html
+++ b/example/marker-clustering-realworld.html
@@ -12,11 +12,7 @@
 
 	<link rel="stylesheet" href="../dist/MarkerCluster.css" />
 	<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
-	<script src="../src/MarkerCluster.Default.js"></script>
-	<script src="../src/MarkerClusterGroup.js"></script>
-	<script src="../src/MarkerCluster.js"></script>
-	<script src="../src/MarkerCluster.QuickHull.js"></script>
-	<script src="../src/MarkerCluster.Spiderfier.js"></script>
+	<script src="../dist/leaflet.markercluster-src.js"></script>
 	
 	<script src="realworld.js"></script>
 
diff --git a/src/MarkerClusterGroup.js b/src/MarkerClusterGroup.js
index 100b5b6..01b1bee 100644
--- a/src/MarkerClusterGroup.js
+++ b/src/MarkerClusterGroup.js
@@ -313,7 +313,7 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
 			me._topClusterLevel._recursivelyBecomeVisible(bounds, depthToStartAt + depthToDescend);
 			//TODO Maybe? Update markers in _recursivelyBecomeVisible
 			for (j in me._layers) {
-				if (this._layers.hasOwnProperty(j)) {
+				if (me._layers.hasOwnProperty(j)) {
 					n = me._layers[j];
 
 					if (!(n instanceof L.MarkerCluster) && n._icon) {

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

