[Pkg-javascript-commits] [leaflet-markercluster] 22/128: Merge pull request #603 from ghybs/leaflet-master-merge

[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 8ecc494100db09ab4c56767b44df036ce8706172
Merge: d1b11d9 6084aa7
Author: Dave Leaver <danzel at localhost.geek.nz>
Date:   Tue Dec 22 10:46:02 2015 +1300

    Merge pull request #603 from ghybs/leaflet-master-merge
    
    Leaflet master merge corrected test suites

 README.md                                          | 207 +++++++--
 build/deps.js                                      |   6 +
 dist/MarkerCluster.css                             |  10 +-
 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                                       |   6 +-
 spec/index.html                                    |   6 +
 spec/karma.conf.js                                 |   2 +-
 spec/suites/CircleMarkerSupportSpec.js             | 133 ++++--
 spec/suites/CircleSupportSpec.js                   | 129 ++++--
 spec/suites/NonPointSpec.js                        | 139 ++++--
 spec/suites/RefreshSpec.js                         | 481 +++++++++++++++++++++
 spec/suites/RememberOpacity.js                     |   2 +-
 spec/suites/animateOptionSpec.js                   | 147 +++++++
 spec/suites/eventsSpec.js                          | 124 ++++--
 spec/suites/removeOutsideVisibleBoundsSpec.js      | 278 ++++++++++++
 spec/suites/singleMarkerModeSpec.js                | 110 +++++
 spec/suites/spiderfySpec.js                        | 104 ++++-
 src/MarkerCluster.Spiderfier.js                    | 194 ++++-----
 src/MarkerCluster.js                               | 115 +++--
 src/MarkerClusterGroup.Refresh.js                  | 123 ++++++
 src/MarkerClusterGroup.js                          | 397 ++++++++++-------
 49 files changed, 2269 insertions(+), 560 deletions(-)

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