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

Do not set layer.options a reference to layer.defaultOptions (fix #3990)

Browse Source 
git bisect point at ad9d0f8c7f
This commit is contained in:
Yohan Boniface 2015-11-18 13:26:01 +01:00
parent 99a48a5255
commit 7a1496ea4d
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spec/suites/layer/GeoJSONSpec.js
View File

@ -1,4 +1,5 @@
describe("L.GeoJSON", function () {
describe("addData", function () {
var geoJSON = {
type: 'Feature',
@ -31,6 +32,29 @@ describe("L.GeoJSON", function () {
expect(layer.getLayers().length).to.eql(0);
});
});
describe('resetStyle', function () {
it('should reset init options', function () {
var feature = {
type: 'Feature',
geometry: {
type: 'LineString',
coordinates:[[-2.35, 51.38], [-2.38, 51.38]]
}
};
var geojson = L.geoJson(feature, {weight: 7, color: 'chocolate'});
geojson.setStyle({weight: 22, color: 'coral'});
var layer = geojson.getLayers()[0];
expect(layer.options.weight).to.be(22);
expect(layer.options.color).to.be('coral');
geojson.resetStyle(layer);
expect(layer.options.weight).to.be(7);
expect(layer.options.color).to.be('chocolate');
});
});
});
describe("L.Marker#toGeoJSON", function () {

2
src/layer/GeoJSON.js
View File

@ -51,7 +51,7 @@ L.GeoJSON = L.FeatureGroup.extend({
resetStyle: function (layer) {
// reset any custom styles
layer.options = layer.defaultOptions;
layer.options = L.Util.extend({}, layer.defaultOptions);
this._setLayerStyle(layer, this.options.style);
return this;
},