From 561414129046fd279147fdaf51a466a2fc571ecd Mon Sep 17 00:00:00 2001 From: Frank Rowe Date: Mon, 25 Nov 2013 14:02:53 -0500 Subject: [PATCH 1/5] leaflet 0.7 + remove ie css --- example/geojson.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/example/geojson.html b/example/geojson.html index 05bca34ed..4a3652dfe 100644 --- a/example/geojson.html +++ b/example/geojson.html @@ -3,15 +3,13 @@ Leaflet debug page - - - + + - From 84454ceda86dca0e913dac2ecb565b52b4f6ba3c Mon Sep 17 00:00:00 2001 From: Frank Rowe Date: Mon, 25 Nov 2013 14:07:30 -0500 Subject: [PATCH 2/5] add oldie styles --- dist/MarkerCluster.Default.css | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dist/MarkerCluster.Default.css b/dist/MarkerCluster.Default.css index 90558dd6c..bbc8c9fb0 100644 --- a/dist/MarkerCluster.Default.css +++ b/dist/MarkerCluster.Default.css @@ -19,6 +19,28 @@ background-color: rgba(241, 128, 23, 0.6); } + /* IE 6-8 fallback colors */ +.leaflet-oldie .marker-cluster-small { + background-color: rgb(181, 226, 140); + } +.leaflet-oldie .marker-cluster-small div { + background-color: rgb(110, 204, 57); + } + +.leaflet-oldie .marker-cluster-medium { + background-color: rgb(241, 211, 87); + } +.leaflet-oldie .marker-cluster-medium div { + background-color: rgb(240, 194, 12); + } + +.leaflet-oldie .marker-cluster-large { + background-color: rgb(253, 156, 115); + } +.leaflet-oldie .marker-cluster-large div { + background-color: rgb(241, 128, 23); +} + .marker-cluster { background-clip: padding-box; border-radius: 20px; From a45ae4bc0d371f69574d91ae4d00dd4a63a93640 Mon Sep 17 00:00:00 2001 From: Frank Rowe Date: Mon, 25 Nov 2013 14:12:39 -0500 Subject: [PATCH 3/5] remove ie css --- dist/MarkerCluster.Default.ie.css | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 dist/MarkerCluster.Default.ie.css diff --git a/dist/MarkerCluster.Default.ie.css b/dist/MarkerCluster.Default.ie.css deleted file mode 100644 index 1d0de51db..000000000 --- a/dist/MarkerCluster.Default.ie.css +++ /dev/null @@ -1,22 +0,0 @@ - /* IE 6-8 fallback colors */ -.marker-cluster-small { - background-color: rgb(181, 226, 140); - } -.marker-cluster-small div { - background-color: rgb(110, 204, 57); - } - -.marker-cluster-medium { - background-color: rgb(241, 211, 87); - } -.marker-cluster-medium div { - background-color: rgb(240, 194, 12); - } - -.marker-cluster-large { - background-color: rgb(253, 156, 115); - } -.marker-cluster-large div { - background-color: rgb(241, 128, 23); -} - From 12367dad72cf14743153e10de680f04f1914c213 Mon Sep 17 00:00:00 2001 From: Frank Rowe Date: Mon, 25 Nov 2013 14:12:56 -0500 Subject: [PATCH 4/5] update examples --- example/marker-clustering-convexhull.html | 6 ++---- example/marker-clustering-everything.html | 6 ++---- example/marker-clustering-geojson.html | 6 ++---- example/marker-clustering-realworld-maxzoom.388.html | 6 ++---- example/marker-clustering-realworld-mobile.388.html | 10 ++++------ example/marker-clustering-realworld.10000.html | 6 ++---- example/marker-clustering-realworld.388.html | 6 ++---- example/marker-clustering-realworld.50000.html | 6 ++---- example/marker-clustering-singlemarkermode.html | 6 ++---- example/marker-clustering-spiderfier.html | 6 ++---- example/marker-clustering-zoomtobounds.html | 6 ++---- example/marker-clustering-zoomtoshowlayer.html | 6 ++---- example/marker-clustering.html | 6 ++---- 13 files changed, 28 insertions(+), 54 deletions(-) diff --git a/example/marker-clustering-convexhull.html b/example/marker-clustering-convexhull.html index aed68d23f..b26d5cc6f 100644 --- a/example/marker-clustering-convexhull.html +++ b/example/marker-clustering-convexhull.html @@ -3,15 +3,13 @@ Leaflet debug page - - - + + - diff --git a/example/marker-clustering-everything.html b/example/marker-clustering-everything.html index de1a2fa75..eab39c54b 100644 --- a/example/marker-clustering-everything.html +++ b/example/marker-clustering-everything.html @@ -3,15 +3,13 @@ Leaflet debug page - - - + + - diff --git a/example/marker-clustering-geojson.html b/example/marker-clustering-geojson.html index 343e139ca..f7287bb32 100644 --- a/example/marker-clustering-geojson.html +++ b/example/marker-clustering-geojson.html @@ -3,15 +3,13 @@ Leaflet debug page - - - + + - diff --git a/example/marker-clustering-realworld-maxzoom.388.html b/example/marker-clustering-realworld-maxzoom.388.html index 6995cc855..bcf4a3dc6 100644 --- a/example/marker-clustering-realworld-maxzoom.388.html +++ b/example/marker-clustering-realworld-maxzoom.388.html @@ -3,15 +3,13 @@ Leaflet debug page - - - + + - diff --git a/example/marker-clustering-realworld-mobile.388.html b/example/marker-clustering-realworld-mobile.388.html index 97ca057d3..3b5a09851 100644 --- a/example/marker-clustering-realworld-mobile.388.html +++ b/example/marker-clustering-realworld-mobile.388.html @@ -3,15 +3,13 @@ Leaflet debug page - - - - - + + + + - diff --git a/example/marker-clustering-realworld.10000.html b/example/marker-clustering-realworld.10000.html index 9a67ea178..873a0f654 100644 --- a/example/marker-clustering-realworld.10000.html +++ b/example/marker-clustering-realworld.10000.html @@ -3,15 +3,13 @@ Leaflet debug page - - - + + - diff --git a/example/marker-clustering-realworld.388.html b/example/marker-clustering-realworld.388.html index 007587373..1431d5969 100644 --- a/example/marker-clustering-realworld.388.html +++ b/example/marker-clustering-realworld.388.html @@ -3,15 +3,13 @@ Leaflet debug page - - - + + - diff --git a/example/marker-clustering-realworld.50000.html b/example/marker-clustering-realworld.50000.html index 216faba6a..0f7c7e662 100644 --- a/example/marker-clustering-realworld.50000.html +++ b/example/marker-clustering-realworld.50000.html @@ -3,15 +3,13 @@ Leaflet debug page - - - + + - diff --git a/example/marker-clustering-singlemarkermode.html b/example/marker-clustering-singlemarkermode.html index a898d751d..ab71f1c9a 100644 --- a/example/marker-clustering-singlemarkermode.html +++ b/example/marker-clustering-singlemarkermode.html @@ -3,15 +3,13 @@ Leaflet debug page - - - + + - diff --git a/example/marker-clustering-spiderfier.html b/example/marker-clustering-spiderfier.html index 5339cad8d..bfa3170c7 100644 --- a/example/marker-clustering-spiderfier.html +++ b/example/marker-clustering-spiderfier.html @@ -3,15 +3,13 @@ Leaflet debug page - - - + + - diff --git a/example/marker-clustering-zoomtobounds.html b/example/marker-clustering-zoomtobounds.html index 316003d37..45b548050 100644 --- a/example/marker-clustering-zoomtobounds.html +++ b/example/marker-clustering-zoomtobounds.html @@ -3,15 +3,13 @@ Leaflet debug page - - - + + - diff --git a/example/marker-clustering-zoomtoshowlayer.html b/example/marker-clustering-zoomtoshowlayer.html index 09284acba..08d763b81 100644 --- a/example/marker-clustering-zoomtoshowlayer.html +++ b/example/marker-clustering-zoomtoshowlayer.html @@ -3,15 +3,13 @@ Leaflet debug page - - - + + - diff --git a/example/marker-clustering.html b/example/marker-clustering.html index 911bc0d7e..82accd4c6 100644 --- a/example/marker-clustering.html +++ b/example/marker-clustering.html @@ -3,15 +3,13 @@ Leaflet debug page - - - + + - From cfc200fd6675ddc7a0fa34c5ac692b2a20ed196f Mon Sep 17 00:00:00 2001 From: Frank Rowe Date: Mon, 25 Nov 2013 14:13:49 -0500 Subject: [PATCH 5/5] update README to require Leaflet 0.7 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a4dfa78c..88bc51e69 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Leaflet.markercluster Provides Beautiful Animated Marker Clustering functionality for [Leaflet](http://leafletjs.com), a JS library for interactive maps. -*Requires Leaflet 0.6.0 or newer.* +*Requires Leaflet 0.7.0 or newer.* For a Leaflet 0.5 compatible version, [Download b128e950](https://github.com/Leaflet/Leaflet.markercluster/archive/b128e950d8f5d7da5b60bd0aa9a88f6d3dd17c98.zip)
For a Leaflet 0.4 compatible version, [Download the 0.2 release](https://github.com/Leaflet/Leaflet.markercluster/archive/0.2.zip)