[Pkg-javascript-commits] [leaflet-markercluster] 34/128: Merge branch 'master' into unspiderfy

[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 37fce91f26c8d31577246e48d1815d7bf169cd7a
Merge: 54976bf ba3c95b
Author: zverev <alexander.zverev at gmail.com>
Date:   Mon Jan 11 12:58:01 2016 +0300

    Merge branch 'master' into unspiderfy

 CHANGELOG.md                                       |  39 ++++++
 README.md                                          |   4 +-
 example/geojson.html                               |   4 +-
 example/marker-clustering-convexhull.html          |   4 +-
 example/marker-clustering-custom.html              |   4 +-
 example/marker-clustering-everything.html          |   4 +-
 example/marker-clustering-geojson.html             |   4 +-
 .../marker-clustering-realworld-maxzoom.388.html   |   4 +-
 .../marker-clustering-realworld-mobile.388.html    |   4 +-
 example/marker-clustering-realworld.10000.html     |   4 +-
 example/marker-clustering-realworld.388.html       |   4 +-
 example/marker-clustering-realworld.50000.html     |   4 +-
 example/marker-clustering-singlemarkermode.html    |   4 +-
 example/marker-clustering-spiderfier.html          |   4 +-
 example/marker-clustering-zoomtobounds.html        |   4 +-
 example/marker-clustering-zoomtoshowlayer.html     |   4 +-
 example/marker-clustering.html                     |   4 +-
 example/old-bugs/add-1000-after.html               |   4 +-
 example/old-bugs/add-markers-offscreen.html        |   4 +-
 example/old-bugs/add-remove-before-addtomap.html   |   4 +-
 example/old-bugs/animationless-zoom.html           |   4 +-
 example/old-bugs/click-cluster-at-screen-edge.html |   4 +-
 .../old-bugs/disappearing-marker-from-spider.html  |   4 +-
 .../doesnt-update-cluster-on-bottom-level.html     |   4 +-
 example/old-bugs/remove-add-clustering.html        |   4 +-
 example/old-bugs/remove-when-spiderfied.html       |   4 +-
 .../removelayer-after-remove-from-map.html         |   4 +-
 example/old-bugs/setView-doesnt-remove.html        |   4 +-
 .../zoomtoshowlayer-doesnt-need-to-zoom.html       |   4 +-
 ...zoomtoshowlayer-doesnt-zoom-if-centered-on.html |   4 +-
 example/remove-geoJSON-when-spiderfied.html        |   4 +-
 package.json                                       |   5 +-
 spec/index.html                                    |   3 +
 spec/karma.conf.js                                 |   2 +-
 spec/suites/CircleMarkerSupportSpec.js             | 133 ++++++++++++++------
 spec/suites/CircleSupportSpec.js                   | 129 ++++++++++++++-----
 spec/suites/NonPointSpec.js                        | 139 ++++++++++++++++-----
 spec/suites/RememberOpacity.js                     |   2 +-
 spec/suites/eventsSpec.js                          | 124 +++++++++++++-----
 spec/suites/getLayersSpec.js                       |  17 +++
 spec/suites/removeLayersSpec.js                    |  24 ++++
 spec/suites/removeOutsideVisibleBoundsSpec.js      |  13 +-
 spec/suites/spiderfySpec.js                        |  18 +--
 src/MarkerCluster.Spiderfier.js                    |  27 +++-
 src/MarkerClusterGroup.js                          |  72 ++++++++---
 45 files changed, 641 insertions(+), 226 deletions(-)


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