[Pkg-javascript-commits] [leaflet-markercluster] 370/479: Update 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 8210331fc9a7786571f213514795180fda322e82
Author: danzel <danzel at localhost.geek.nz>
Date:   Fri Jun 14 17:09:56 2013 +1200

    Update build
---
 dist/leaflet.markercluster-src.js | 23 ++++++++++++++++++-----
 dist/leaflet.markercluster.js     |  2 +-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/dist/leaflet.markercluster-src.js b/dist/leaflet.markercluster-src.js
index d8b0960..17c7da6 100644
--- a/dist/leaflet.markercluster-src.js
+++ b/dist/leaflet.markercluster-src.js
@@ -118,9 +118,11 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
 		//Remove the marker from clusters
 		this._removeLayer(layer, true);
 
-		if (layer._icon) {
+		if (layer._icon || layer._container) {
 			L.FeatureGroup.prototype.removeLayer.call(this, layer);
-			layer.setOpacity(1);
+			if (layer.setOpacity) {
+				layer.setOpacity(1);
+			}
 		}
 
 		return this;
@@ -451,7 +453,9 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
 					//Cluster is currently on the map, need to put the marker on the map instead
 					L.FeatureGroup.prototype.removeLayer.call(this, cluster);
 					if (!dontUpdateMap) {
+						otherMarker._noHas = true;
 						L.FeatureGroup.prototype.addLayer.call(this, otherMarker);
+						delete otherMarker._noHas;
 					}
 				}
 			} else {
@@ -908,6 +912,9 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
 	}
 });
 
+L.markerClusterGroup = function (options) {
+	return new L.MarkerClusterGroup(options);
+};
 
 L.MarkerCluster = L.Marker.extend({
 	initialize: function (group, zoom, a, b) {
@@ -1121,7 +1128,9 @@ L.MarkerCluster = L.Marker.extend({
 						nm._backupLatlng = nm.getLatLng();
 
 						nm.setLatLng(startPos);
-						nm.setOpacity(0);
+						if (nm.setOpacity) {
+							nm.setOpacity(0);
+						}
 					}
 
 					nm._noHas = true;
@@ -1174,7 +1183,9 @@ L.MarkerCluster = L.Marker.extend({
 					m = c._markers[i];
 					if (!exceptBounds || !exceptBounds.contains(m._latlng)) {
 						L.FeatureGroup.prototype.removeLayer.call(c._group, m);
-						m.setOpacity(1);
+						if (m.setOpacity) {
+							m.setOpacity(1);
+						}
 					}
 				}
 			},
@@ -1186,7 +1197,9 @@ L.MarkerCluster = L.Marker.extend({
 						if (!L.FeatureGroup.prototype.hasLayer || L.FeatureGroup.prototype.hasLayer.call(c._group, m)) {
 							L.FeatureGroup.prototype.removeLayer.call(c._group, m);
 						}
-						m.setOpacity(1);
+						if (m.setOpacity) {
+							m.setOpacity(1);
+						}
 					}
 				}
 			}
diff --git a/dist/leaflet.markercluster.js b/dist/leaflet.markercluster.js
index 3b7424c..01446d2 100644
--- a/dist/leaflet.markercluster.js
+++ b/dist/leaflet.markercluster.js
@@ -3,4 +3,4 @@
  https://github.com/Leaflet/Leaflet.markercluster
  (c) 2012-2013, Dave Leaver, smartrak
 */
-!function(t,e){L.MarkerClusterGroup=L.FeatureGroup.extend({options:{maxClusterRadius:80,iconCreateFunction:null,spiderfyOnMaxZoom:!0,showCoverageOnHover:!0,zoomToBoundsOnClick:!0,singleMarkerMode:!1,disableClusteringAtZoom:null,removeOutsideVisibleBounds:!0,animateAddingMarkers:!1,spiderfyDistanceMultiplier:1,polygonOptions:{}},initialize:function(t){L.Util.setOptions(this,t),this.options.iconCreateFunction||(this.options.iconCreateFunction=this._defaultIconCreateFunction),L.FeatureGroup [...]
\ No newline at end of file
+!function(t,e){L.MarkerClusterGroup=L.FeatureGroup.extend({options:{maxClusterRadius:80,iconCreateFunction:null,spiderfyOnMaxZoom:!0,showCoverageOnHover:!0,zoomToBoundsOnClick:!0,singleMarkerMode:!1,disableClusteringAtZoom:null,removeOutsideVisibleBounds:!0,animateAddingMarkers:!1,spiderfyDistanceMultiplier:1,polygonOptions:{}},initialize:function(t){L.Util.setOptions(this,t),this.options.iconCreateFunction||(this.options.iconCreateFunction=this._defaultIconCreateFunction),L.FeatureGroup [...]
\ 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