[Pkg-javascript-commits] [leaflet-markercluster] 198/219: Merge commit 'ac8c7063af5ea8e9cce4ce595c7d8303dc595c17'

[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 e5ab67d26bc2e1531b4b39f74424054d909a3e1e
Merge: d9c1310 ac8c706
Author: danzel <danzel at localhost.geek.nz>
Date:   Tue Dec 22 09:43:29 2015 +1300

    Merge commit 'ac8c7063af5ea8e9cce4ce595c7d8303dc595c17'
    
    Conflicts:
    	src/MarkerCluster.Spiderfier.js

 src/MarkerCluster.Spiderfier.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --cc src/MarkerCluster.Spiderfier.js
index a980a21,ee56729..1d27018
--- a/src/MarkerCluster.Spiderfier.js
+++ b/src/MarkerCluster.Spiderfier.js
@@@ -146,9 -135,17 +146,12 @@@ L.MarkerClusterNonAnimated = L.MarkerCl
  			}
  
  			fg.addLayer(m);
 -
 -
 -			leg = new L.Polyline([this._latlng, newPos], { weight: 1.5, color: '#222' });
 -			map.addLayer(leg);
 -			m._spiderLeg = leg;
  		}
  		this.setOpacity(0.3);
- 		group.fire('spiderfied');
+ 		group.fire('spiderfied', {
+ 			cluster: this,
+ 			markers: childMarkers
+ 		});
  	},
  
  	_animationUnspiderfy: function () {

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