ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6998 from openlayers/greenkeeper/eslint-4.2.0

Browse Source 
Update eslint to the latest version 🚀
This commit is contained in:
Andreas Hocevar
2017-07-09 16:52:47 +02:00
committed by GitHub
parent e6e0109a1b cff9ef5e63
commit 59d8d749e3
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1 -1
View File
@@ -57,7 +57,7 @@
"clean-css-cli": "4.1.6", "clean-css-cli": "4.1.6",
"coveralls": "2.13.1", "coveralls": "2.13.1",
"debounce": "^1.0.0", "debounce": "^1.0.0",
"eslint": "4.1.1", "eslint": "4.2.0",
"eslint-config-openlayers": "7.0.0", "eslint-config-openlayers": "7.0.0",
"eslint-plugin-openlayers-internal": "^3.1.0", "eslint-plugin-openlayers-internal": "^3.1.0",
"expect.js": "0.3.1", "expect.js": "0.3.1",
src/ol/renderer/canvas/vectorlayer.js
+3 -4
View File
@@ -277,10 +277,9 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame = function(frameState, lay
this.dirty_ = false; this.dirty_ = false;
var replayGroup = var replayGroup = new ol.render.canvas.ReplayGroup(
new ol.render.canvas.ReplayGroup( ol.renderer.vector.getTolerance(resolution, pixelRatio), extent,
ol.renderer.vector.getTolerance(resolution, pixelRatio), extent, resolution, vectorSource.getOverlaps(), vectorLayer.getRenderBuffer());
resolution, vectorSource.getOverlaps(), vectorLayer.getRenderBuffer());
vectorSource.loadFeatures(extent, resolution, projection); vectorSource.loadFeatures(extent, resolution, projection);
/** /**
* @param {ol.Feature} feature Feature. * @param {ol.Feature} feature Feature.
test/spec/ol/interaction/translate.test.js
+2 -2
View File
@@ -32,8 +32,8 @@ describe('ol.interaction.Translate', function() {
features = [new ol.Feature({ features = [new ol.Feature({
geometry: new ol.geom.Point([10, -20]) geometry: new ol.geom.Point([10, -20])
}), new ol.Feature({ }), new ol.Feature({
geometry: new ol.geom.Point([20, -30]) geometry: new ol.geom.Point([20, -30])
})]; })];
source.addFeatures(features); source.addFeatures(features);
var layer = new ol.layer.Vector({source: source}); var layer = new ol.layer.Vector({source: source});
map = new ol.Map({ map = new ol.Map({
test_rendering/spec/ol/style/linestring.test.js
+2 -2
View File
@@ -72,8 +72,8 @@ describe('ol.rendering.style.LineString', function() {
feature.setStyle([new ol.style.Style({ feature.setStyle([new ol.style.Style({
stroke: new ol.style.Stroke({color: '#F2F211', width: 5}) stroke: new ol.style.Stroke({color: '#F2F211', width: 5})
}), new ol.style.Style({ }), new ol.style.Style({
stroke: new ol.style.Stroke({color: '#292921', width: 1}) stroke: new ol.style.Stroke({color: '#292921', width: 1})
})]); })]);
vectorSource.addFeature(feature); vectorSource.addFeature(feature);
feature = new ol.Feature({ feature = new ol.Feature({