cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'stable' into gh-pages

Browse Source 
# By Vladimir Agafonkin (3) and danzel (1)
* stable:
  bump version to 0.5.1 and update build
  backport the geojson featurecollection arrays fix
  Make setRadius and updateStyle({radius: 123 }) work.
  add generated coverage to gitignore in stable
This commit is contained in:
Vladimir Agafonkin 2013-02-06 15:56:00 +02:00
commit 865953816d
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ _site
*.sublime-*
_site
dist/*.js
spec/coverage

6
dist/leaflet-src.js vendored
View File

@ -23,7 +23,7 @@ if (typeof exports !== undefined + '') {
window.L = L;
}
L.version = '0.5';
L.version = '0.5.1';
/*
@ -5317,7 +5317,7 @@ L.CircleMarker = L.Circle.extend({
},
setRadius: function (radius) {
this._radius = radius;
this.options.radius = this._radius = radius;
return this.redraw();
}
});
@ -5441,7 +5441,7 @@ L.GeoJSON = L.FeatureGroup.extend({
if (features) {
for (i = 0, len = features.length; i < len; i++) {
// Only add this if geometry or geometries are set and not null
if (features[i].geometries || features[i].geometry) {
if (features[i].geometries || features[i].geometry || features[i].features) {
this.addData(features[i]);
}
}

4
dist/leaflet.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/Leaflet.js
View File

@ -19,4 +19,4 @@ if (typeof exports !== undefined + '') {
window.L = L;
}
L.version = '0.5';
L.version = '0.5.1';

4
src/layer/GeoJSON.js
View File

@ -15,13 +15,13 @@ L.GeoJSON = L.FeatureGroup.extend({
},
addData: function (geojson) {
var features = L.Util.isArray(geojson) ? geojson : geojson.features,
var features = L.Util.isArray(geojson) ? geojson : geojson.features,
i, len;
if (features) {
for (i = 0, len = features.length; i < len; i++) {
// Only add this if geometry or geometries are set and not null
if (features[i].geometries || features[i].geometry) {
if (features[i].geometries || features[i].geometry || features[i].features) {
this.addData(features[i]);
}
}

2
src/layer/vector/CircleMarker.js
View File

@ -23,7 +23,7 @@ L.CircleMarker = L.Circle.extend({
},
setRadius: function (radius) {
this._radius = radius;
this.options.radius = this._radius = radius;
return this.redraw();
}
});