Merge pull request #7041 from openlayers/greenkeeper/eslint-4.3.0

Update eslint to the latest version 🚀
This commit is contained in:
Andreas Hocevar
2017-07-25 10:55:25 +02:00
committed by GitHub
5 changed files with 5 additions and 8 deletions
+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.2.0", "eslint": "4.3.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",
+1 -2
View File
@@ -414,8 +414,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
break; break;
case ol.render.canvas.Instruction.END_GEOMETRY: case ol.render.canvas.Instruction.END_GEOMETRY:
if (featureCallback !== undefined) { if (featureCallback !== undefined) {
feature = feature = /** @type {ol.Feature|ol.render.Feature} */ (instruction[1]);
/** @type {ol.Feature|ol.render.Feature} */ (instruction[1]);
var result = featureCallback(feature); var result = featureCallback(feature);
if (result) { if (result) {
return result; return result;
+1 -1
View File
@@ -140,7 +140,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.createReplayGroup_ = function(
0, 0,
-sourceTileExtent[0], -sourceTileExtent[3]); -sourceTileExtent[0], -sourceTileExtent[3]);
extent = (ol.transform.apply(transform, [sharedExtent[0], sharedExtent[3]]) extent = (ol.transform.apply(transform, [sharedExtent[0], sharedExtent[3]])
.concat(ol.transform.apply(transform, [sharedExtent[2], sharedExtent[1]]))); .concat(ol.transform.apply(transform, [sharedExtent[2], sharedExtent[1]])));
} else { } else {
tileResolution = resolution; tileResolution = resolution;
extent = sharedExtent; extent = sharedExtent;
+1 -2
View File
@@ -74,8 +74,7 @@ ol.source.ImageWMS = function(opt_options) {
* @private * @private
* @type {ol.source.WMSServerType|undefined} * @type {ol.source.WMSServerType|undefined}
*/ */
this.serverType_ = this.serverType_ = /** @type {ol.source.WMSServerType|undefined} */ (options.serverType);
/** @type {ol.source.WMSServerType|undefined} */ (options.serverType);
/** /**
* @private * @private
+1 -2
View File
@@ -72,8 +72,7 @@ ol.source.TileWMS = function(opt_options) {
* @private * @private
* @type {ol.source.WMSServerType|undefined} * @type {ol.source.WMSServerType|undefined}
*/ */
this.serverType_ = this.serverType_ = /** @type {ol.source.WMSServerType|undefined} */ (options.serverType);
/** @type {ol.source.WMSServerType|undefined} */ (options.serverType);
/** /**
* @private * @private