diff --git a/examples/igc.js b/examples/igc.js index 2658abc951..d2684b7297 100644 --- a/examples/igc.js +++ b/examples/igc.js @@ -155,7 +155,7 @@ map.on('click', function(evt) { var stroke = new ol.style.Stroke({ color: 'rgba(255,0,0,0.9)', width: 1 -}) +}); var style = new ol.style.Style({ stroke: stroke, image: new ol.style.Circle({ diff --git a/examples/render-geometry.js b/examples/render-geometry.js index 0dd1eb1620..c3c5087659 100644 --- a/examples/render-geometry.js +++ b/examples/render-geometry.js @@ -21,7 +21,7 @@ var style = new ol.style.Style({ fill: fill, stroke: stroke }) -}) +}); vectorContext.setStyle(style); vectorContext.drawGeometry(new ol.geom.LineString([[10, 10], [90, 90]])); diff --git a/src/ol/array.js b/src/ol/array.js index d54eafac36..e00a272eb3 100644 --- a/src/ol/array.js +++ b/src/ol/array.js @@ -36,7 +36,7 @@ ol.array.binarySearch = function(haystack, needle, opt_comparator) { /* Key not found. */ return found ? low : ~low; -} +}; /** * @param {Array.} arr Array. @@ -188,11 +188,11 @@ ol.array.flatten = function(arr) { ol.array.extend = function(arr, data) { var i; var extension = goog.isArrayLike(data) ? data : [data]; - var length = extension.length + var length = extension.length; for (i = 0; i < length; i++) { arr[arr.length] = extension[i]; } -} +}; /** @@ -208,7 +208,7 @@ ol.array.remove = function(arr, obj) { arr.splice(i, 1); } return found; -} +}; /** @@ -228,7 +228,7 @@ ol.array.find = function(arr, func) { } } return null; -} +}; /** @@ -247,7 +247,7 @@ ol.array.equals = function(arr1, arr2) { } } return true; -} +}; /** @@ -267,7 +267,7 @@ ol.array.stableSort = function(arr, compareFnc) { for (i = 0; i < arr.length; i++) { arr[i] = tmp[i].value; } -} +}; /** @@ -282,7 +282,7 @@ ol.array.findIndex = function(arr, func) { return !func(el, idx, arr); }); return found ? index : -1; -} +}; /** @@ -300,4 +300,4 @@ ol.array.isSorted = function(arr, opt_func, opt_strict) { var res = compare(arr[index - 1], currentVal); return !(res > 0 || opt_strict && res === 0); }); -} +}; diff --git a/src/ol/control/mousepositioncontrol.js b/src/ol/control/mousepositioncontrol.js index 5947c4ee13..5f415621e3 100644 --- a/src/ol/control/mousepositioncontrol.js +++ b/src/ol/control/mousepositioncontrol.js @@ -37,7 +37,7 @@ ol.control.MousePosition = function(opt_options) { var options = opt_options ? opt_options : {}; var element = document.createElement('DIV'); - element.className = options.className !== undefined ? options.className : 'ol-mouse-position' + element.className = options.className !== undefined ? options.className : 'ol-mouse-position'; var render = options.render ? options.render : ol.control.MousePosition.render; diff --git a/src/ol/events.js b/src/ol/events.js index ad572dc42a..b1d7e01cb5 100644 --- a/src/ol/events.js +++ b/src/ol/events.js @@ -74,7 +74,7 @@ ol.events.bindListener_ = function(listenerObj) { ol.events.unlistenByKey(listenerObj); } return listener.call(bindTo, evt); - } + }; listenerObj.boundListener = boundListener; return boundListener; }; @@ -150,7 +150,7 @@ ol.events.removeListeners_ = function(target, type) { if (listeners) { for (var i = 0, ii = listeners.length; i < ii; ++i) { target.removeEventListener(type, listeners[i].boundListener); - ol.object.clear(listeners[i]) + ol.object.clear(listeners[i]); } listeners.length = 0; var listenerMap = target[ol.events.LISTENER_MAP_PROP_]; diff --git a/src/ol/interaction/draganddropinteraction.js b/src/ol/interaction/draganddropinteraction.js index e5ad0a2c69..856cb3e5a9 100644 --- a/src/ol/interaction/draganddropinteraction.js +++ b/src/ol/interaction/draganddropinteraction.js @@ -157,7 +157,7 @@ ol.interaction.DragAndDrop.prototype.setMap = function(map) { ol.interaction.DragAndDrop.handleStop_, this), ol.events.listen(dropArea, ol.events.EventType.DROP, ol.interaction.DragAndDrop.handleStop_, this) - ] + ]; } }; diff --git a/src/ol/interaction/keyboardpaninteraction.js b/src/ol/interaction/keyboardpaninteraction.js index 193bc68b7c..0753efd2af 100644 --- a/src/ol/interaction/keyboardpaninteraction.js +++ b/src/ol/interaction/keyboardpaninteraction.js @@ -42,14 +42,14 @@ ol.interaction.KeyboardPan = function(opt_options) { this.defaultCondition_ = function(mapBrowserEvent) { return ol.events.condition.noModifierKeys(mapBrowserEvent) && ol.events.condition.targetNotEditable(mapBrowserEvent); - } + }; /** * @private * @type {ol.events.ConditionType} */ this.condition_ = options.condition !== undefined ? - options.condition : this.defaultCondition_ + options.condition : this.defaultCondition_; /** * @private diff --git a/src/ol/interaction/modifyinteraction.js b/src/ol/interaction/modifyinteraction.js index e5329d5116..e192c4b48e 100644 --- a/src/ol/interaction/modifyinteraction.js +++ b/src/ol/interaction/modifyinteraction.js @@ -117,7 +117,7 @@ ol.interaction.Modify = function(options) { this.defaultDeleteCondition_ = function(mapBrowserEvent) { return ol.events.condition.noModifierKeys(mapBrowserEvent) && ol.events.condition.singleClick(mapBrowserEvent); - } + }; /** * @type {ol.events.ConditionType} diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js index 271f17e380..feaed6bffb 100644 --- a/src/ol/renderer/canvas/canvastilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js @@ -259,7 +259,7 @@ ol.renderer.canvas.TileLayer.prototype.renderTileImages = function(context, fram drawOffsetX = (drawSize - width) / 2 / drawScale; drawOffsetY = (drawSize - height) / 2 / drawScale; pixelScale *= drawScale; - offsetX = Math.round(drawScale * (offsetX + drawOffsetX)) + offsetX = Math.round(drawScale * (offsetX + drawOffsetX)); offsetY = Math.round(drawScale * (offsetY + drawOffsetY)); } // for performance reasons, context.save / context.restore is not used diff --git a/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js b/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js index 42732e2cdb..56ea0cfe82 100644 --- a/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js @@ -445,4 +445,4 @@ ol.renderer.canvas.VectorTileLayer.prototype.renderTileImage_ = function( replayState.replayGroup.replay(tileContext, pixelRatio, tileTransform, 0, frameState.skippedFeatureUids || {}, replays); } -} +}; diff --git a/src/ol/reproj/reproj.js b/src/ol/reproj/reproj.js index 119a6b354b..734c11eb04 100644 --- a/src/ol/reproj/reproj.js +++ b/src/ol/reproj/reproj.js @@ -27,7 +27,7 @@ ol.reproj.browserAntialiasesClip_ = (function(winNav, winChrome) { isOpera == false && // Not Opera isIEedge == false // Not Edge ); -})(goog.global.navigator, goog.global.chrome) +})(goog.global.navigator, goog.global.chrome); /** diff --git a/src/ol/source/cartodb.js b/src/ol/source/cartodb.js index 5b6bbf8954..08c83559e5 100644 --- a/src/ol/source/cartodb.js +++ b/src/ol/source/cartodb.js @@ -148,7 +148,7 @@ ol.source.CartoDB.prototype.handleInitResponse_ = function(paramHash, event) { */ ol.source.CartoDB.prototype.handleInitError_ = function(event) { this.setState(ol.source.State.ERROR); -} +}; /** diff --git a/src/ol/source/source.js b/src/ol/source/source.js index 0cce27404a..9e66b8e36a 100644 --- a/src/ol/source/source.js +++ b/src/ol/source/source.js @@ -99,7 +99,7 @@ ol.source.Source.toAttributionsArray_ = function(attributionLike) { } else { return null; } -} +}; /** diff --git a/src/ol/style/atlasmanager.js b/src/ol/style/atlasmanager.js index 0ca4bd08e8..6e2367900e 100644 --- a/src/ol/style/atlasmanager.js +++ b/src/ol/style/atlasmanager.js @@ -175,7 +175,7 @@ ol.style.AtlasManager.prototype.add = function(id, width, height, // the hit-detection atlas, to make sure that the offset is the same for // the original image and the hit-detection image. var renderHitCallback = opt_renderHitCallback !== undefined ? - opt_renderHitCallback : ol.nullFunction + opt_renderHitCallback : ol.nullFunction; /** @type {?ol.style.AtlasInfo} */ var hitInfo = this.add_(true, diff --git a/src/ol/uri.js b/src/ol/uri.js index b73c5f642d..8c45e6bbf8 100644 --- a/src/ol/uri.js +++ b/src/ol/uri.js @@ -14,8 +14,8 @@ ol.uri.appendParams = function(uri, params) { return k + '=' + encodeURIComponent(params[k]); }).join('&'); // remove any trailing ? or & - uri = uri.replace(/[?&]$/, '') + uri = uri.replace(/[?&]$/, ''); // append ? or & depending on whether uri has existing parameters - uri = uri.indexOf('?') === -1 ? uri + '?' : uri + '&' + uri = uri.indexOf('?') === -1 ? uri + '?' : uri + '&'; return uri + qs; }; diff --git a/test/spec/ol/control/scalelinecontrol.test.js b/test/spec/ol/control/scalelinecontrol.test.js index 724fdec5e2..4748129d26 100644 --- a/test/spec/ol/control/scalelinecontrol.test.js +++ b/test/spec/ol/control/scalelinecontrol.test.js @@ -1,7 +1,7 @@ goog.provide('ol.test.control.ScaleLine'); describe('ol.control.ScaleLine', function() { - var mapDiv + var mapDiv; var map; beforeEach(function() { mapDiv = document.createElement('div'); diff --git a/test/spec/ol/dom/dom.test.js b/test/spec/ol/dom/dom.test.js index afd3004087..d53e4552f9 100644 --- a/test/spec/ol/dom/dom.test.js +++ b/test/spec/ol/dom/dom.test.js @@ -127,7 +127,7 @@ describe('ol.dom', function() { // revert mock-ups goog.userAgent.IE = originalIsIE; - goog.userAgent.isVersionOrHigher = originalIsVersionOrHigher + goog.userAgent.isVersionOrHigher = originalIsVersionOrHigher; }); it('sets transform origin *only* for IE 9', function() { @@ -201,7 +201,7 @@ describe('ol.dom', function() { }; ol.dom.canUseCssTransform = function() { return true; - } + }; // test ol.dom.transformElement2D(element, transform); @@ -224,7 +224,7 @@ describe('ol.dom', function() { }; ol.dom.canUseCssTransform = function() { return true; - } + }; // test ol.dom.transformElement2D(element, transformFloat, 2); @@ -245,7 +245,7 @@ describe('ol.dom', function() { }; ol.dom.canUseCssTransform = function() { return false; - } + }; // test ol.dom.transformElement2D(element, transform); diff --git a/test/spec/ol/events.test.js b/test/spec/ol/events.test.js index 30f6f5f944..28d9167353 100644 --- a/test/spec/ol/events.test.js +++ b/test/spec/ol/events.test.js @@ -46,7 +46,7 @@ describe('ol.events', function() { listenerObj.listener = function() { expect(this).to.equal(bindTo); expect(unlistenSpy.firstCall.args[0]).to.eql(listenerObj); - } + }; var boundListener = ol.events.bindListener_(listenerObj); expect(listenerObj.boundListener).to.equal(boundListener); boundListener(); diff --git a/test/spec/ol/imagetile.test.js b/test/spec/ol/imagetile.test.js index cb01bdb1a7..46a44c251f 100644 --- a/test/spec/ol/imagetile.test.js +++ b/test/spec/ol/imagetile.test.js @@ -11,7 +11,7 @@ describe('ol.ImageTile', function() { var tileLoadFunction = ol.source.Image.defaultImageLoadFunction; var tile = new ol.ImageTile(tileCoord, state, src, null, tileLoadFunction); - var previousState = tile.getState() + var previousState = tile.getState(); ol.events.listen(tile, ol.events.EventType.CHANGE, function(event) { var state = tile.getState(); @@ -36,7 +36,7 @@ describe('ol.ImageTile', function() { var tileLoadFunction = ol.source.Image.defaultImageLoadFunction; var tile = new ol.ImageTile(tileCoord, state, src, null, tileLoadFunction); - var previousState = tile.getState() + var previousState = tile.getState(); ol.events.listen(tile, ol.events.EventType.CHANGE, function(event) { var state = tile.getState(); diff --git a/test/spec/ol/interaction/draganddropinteraction.test.js b/test/spec/ol/interaction/draganddropinteraction.test.js index e10066c7cb..ec2d78077b 100644 --- a/test/spec/ol/interaction/draganddropinteraction.test.js +++ b/test/spec/ol/interaction/draganddropinteraction.test.js @@ -10,7 +10,7 @@ describe('ol.interaction.DragAndDrop', function() { return viewport; }, getView: function() { - return new ol.View() + return new ol.View(); } }; interaction = new ol.interaction.DragAndDrop({ @@ -100,7 +100,7 @@ describe('ol.interaction.DragAndDrop', function() { features: [{type: 'Feature', id: '1'}] }); } - } + }; viewport.dispatchEvent(event); expect(event.dataTransfer.dropEffect).to.be('copy'); expect(event.propagationStopped).to.be(true); diff --git a/test/spec/ol/layer/vectortilelayer.test.js b/test/spec/ol/layer/vectortilelayer.test.js index 44a5a73495..1fc32cd864 100644 --- a/test/spec/ol/layer/vectortilelayer.test.js +++ b/test/spec/ol/layer/vectortilelayer.test.js @@ -30,7 +30,7 @@ describe('ol.layer.VectorTile', function() { it('provides default renderMode', function() { expect(layer.getRenderMode()).to.be('hybrid'); - }) + }); }); diff --git a/test/spec/ol/render/box.test.js b/test/spec/ol/render/box.test.js index d9cd0ba8a7..e5a27fccea 100644 --- a/test/spec/ol/render/box.test.js +++ b/test/spec/ol/render/box.test.js @@ -32,7 +32,7 @@ describe('ol.render.Box', function() { expect(obj).to.be.a(ol.render.Box); expect(obj).to.be.a(ol.Disposable); obj.dispose(); - }) + }); it('creates an absolutely positioned DIV with a className', function() { expect(box.element_).to.be.a(HTMLDivElement); expect(box.element_.style.position).to.be('absolute'); diff --git a/test/spec/ol/render/canvasimmediate.test.js b/test/spec/ol/render/canvasimmediate.test.js index 5b78c31d16..132fc0e4dc 100644 --- a/test/spec/ol/render/canvasimmediate.test.js +++ b/test/spec/ol/render/canvasimmediate.test.js @@ -165,7 +165,7 @@ describe('ol.render.canvas.Immediate', function() { if (instruction.args) { parts.push('args: [' + instruction.args.map(function(arg) { if (typeof arg === 'number') { - return arg.toFixed(9) + return arg.toFixed(9); } else { return arg; } diff --git a/test/spec/ol/renderer/canvas/canvaslayerrenderer.test.js b/test/spec/ol/renderer/canvas/canvaslayerrenderer.test.js index f06d144002..2dead6d8c0 100644 --- a/test/spec/ol/renderer/canvas/canvaslayerrenderer.test.js +++ b/test/spec/ol/renderer/canvas/canvaslayerrenderer.test.js @@ -28,7 +28,7 @@ describe('ol.renderer.canvas.Layer', function() { }; renderer.getImageTransform = function() { return goog.vec.Mat4.createNumberIdentity(); - } + }; ol.renderer.Map.prototype.calculateMatrices2D(frameState); var layerState = layer.getLayerState(); var context = { @@ -41,7 +41,7 @@ describe('ol.renderer.canvas.Layer', function() { lineTo: sinon.spy(), clip: sinon.spy(), drawImage: sinon.spy() - } + }; renderer.composeFrame(frameState, layerState, context); expect(context.save.callCount).to.be(1); expect(context.translate.callCount).to.be(0); diff --git a/test/spec/ol/renderer/canvas/canvasvectortilelayerrenderer.test.js b/test/spec/ol/renderer/canvas/canvasvectortilelayerrenderer.test.js index f84b331be8..568582f244 100644 --- a/test/spec/ol/renderer/canvas/canvasvectortilelayerrenderer.test.js +++ b/test/spec/ol/renderer/canvas/canvasvectortilelayerrenderer.test.js @@ -111,7 +111,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() { var tile; tileCallback = function(t) { tile = t; - } + }; map.renderSync(); expect(tile.getProjection()).to.equal(ol.proj.get('EPSG:3857')); expect(feature1.getGeometry().getCoordinates()).to.eql( @@ -124,7 +124,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() { tileCallback = function(t) { t.setProjection(proj); tile = t; - } + }; map.renderSync(); expect(tile.getProjection()).to.equal(proj); expect(feature1.getGeometry().getCoordinates()).to.eql([1, -1]); diff --git a/test/spec/ol/source/clustersource.test.js b/test/spec/ol/source/clustersource.test.js index 19b66b8cb6..614d084004 100644 --- a/test/spec/ol/source/clustersource.test.js +++ b/test/spec/ol/source/clustersource.test.js @@ -55,7 +55,7 @@ describe('ol.source.Cluster', function() { expect(source.getFeatures().length).to.be(1); expect(source.getFeatures()[0].get('features').length).to.be(2); }); - }) + }); }); goog.require('ol.Feature'); diff --git a/test/spec/ol/source/source.test.js b/test/spec/ol/source/source.test.js index fb1c4a2683..1053ed203a 100644 --- a/test/spec/ol/source/source.test.js +++ b/test/spec/ol/source/source.test.js @@ -149,7 +149,7 @@ describe('ol.source.Source', function() { }); it('accepts an array with a string and an ol.Attribution', function() { var attribution = new ol.Attribution({html: 'Dumpty'}); - source.setAttributions(['Humpty', attribution]) + source.setAttributions(['Humpty', attribution]); var attributions = source.getAttributions(); expect(attributions).to.not.be(null); expect(attributions).to.have.length(2); diff --git a/test/spec/ol/source/tileutfgridsource.test.js b/test/spec/ol/source/tileutfgridsource.test.js index 90f5294d92..1eafc1fd62 100644 --- a/test/spec/ol/source/tileutfgridsource.test.js +++ b/test/spec/ol/source/tileutfgridsource.test.js @@ -95,7 +95,7 @@ describe('ol.source.TileUTFGrid', function() { // locally available tileJson (from `before`) source.handleTileJSONResponse(tileJson); - var tileGrid = source.getTileGrid() + var tileGrid = source.getTileGrid(); expect(tileGrid).to.not.be(null); expect(tileGrid).to.be.an(ol.tilegrid.TileGrid); }); @@ -142,7 +142,7 @@ describe('ol.source.TileUTFGrid', function() { var tileGrid = source.getTileGrid(); var maxZoom = tileGrid.getMaxZoom(); expect(maxZoom).to.eql(tileJson.maxzoom); - }) + }); it('sets up a template', function() { var source = getTileUTFGrid(); @@ -169,9 +169,9 @@ describe('ol.source.TileUTFGrid', function() { expect(attributions).to.not.be(null); expect(attributions).to.have.length(1); expect(attributions[0].getHTML()).to.be(tileJson.attribution); - var tileRanges = attributions[0].tileRanges_ + var tileRanges = attributions[0].tileRanges_; for (var z = tileJson.minzoom; z <= tileJson.maxzoom; z++) { - var key = z.toString() + var key = z.toString(); expect(key in tileRanges).to.be(true); } }); @@ -207,7 +207,7 @@ describe('ol.source.TileUTFGrid', function() { done(); }); client.addEventListener('error', function() { - done(new Error('Failed to fetch local grid.json')) + done(new Error('Failed to fetch local grid.json')); }); client.open('GET', 'spec/ol/data/mapbox-geography-class-1-1-0.grid.json'); client.send(); diff --git a/test/spec/ol/source/zoomifysource.test.js b/test/spec/ol/source/zoomifysource.test.js index 440ff6b292..f3b80571d8 100644 --- a/test/spec/ol/source/zoomifysource.test.js +++ b/test/spec/ol/source/zoomifysource.test.js @@ -190,7 +190,7 @@ describe('ol.source.Zoomify', function() { it('returns expected tileClass instances via "getTile"', function() { var source = getZoomifySource(); - var tile = source.getTile(0, 0, -1, 1, proj) + var tile = source.getTile(0, 0, -1, 1, proj); expect(tile).to.be.an(ol.source.ZoomifyTile_); }); diff --git a/test/spec/ol/structs/priorityqueue.test.js b/test/spec/ol/structs/priorityqueue.test.js index aa2264dca0..29bac4c78e 100644 --- a/test/spec/ol/structs/priorityqueue.test.js +++ b/test/spec/ol/structs/priorityqueue.test.js @@ -5,7 +5,7 @@ describe('ol.structs.PriorityQueue', function() { var identity = function(a) { return a; - } + }; describe('when empty', function() { diff --git a/test/spec/ol/style/iconstyle.test.js b/test/spec/ol/style/iconstyle.test.js index b477d76dbf..0a10ed0645 100644 --- a/test/spec/ol/style/iconstyle.test.js +++ b/test/spec/ol/style/iconstyle.test.js @@ -9,7 +9,7 @@ goog.require('ol.style.IconOrigin'); describe('ol.style.Icon', function() { var size = [36, 48]; var src = 'data:image/gif;base64,' + - 'R0lGODlhAQABAIAAAP///wAAACwAAAAAAQABAAACAkQBADs=' + 'R0lGODlhAQABAIAAAP///wAAACwAAAAAAQABAAACAkQBADs='; describe('constructor', function() { diff --git a/test_rendering/spec/ol/layer/tile.test.js b/test_rendering/spec/ol/layer/tile.test.js index ba547f1bcf..de14eaac10 100644 --- a/test_rendering/spec/ol/layer/tile.test.js +++ b/test_rendering/spec/ol/layer/tile.test.js @@ -206,7 +206,7 @@ describe('ol.rendering.layer.Tile', function() { e.vectorContext.drawPoint(new ol.geom.Point( ol.proj.transform([-123, 38], 'EPSG:4326', 'EPSG:3857'))); }); - } + }; }); afterEach(function() { diff --git a/test_rendering/spec/ol/layer/vector.test.js b/test_rendering/spec/ol/layer/vector.test.js index eaea34aac5..36736c9c34 100644 --- a/test_rendering/spec/ol/layer/vector.test.js +++ b/test_rendering/spec/ol/layer/vector.test.js @@ -34,7 +34,7 @@ describe('ol.rendering.layer.Vector', function() { [center[0] - r, center[1] + r], [center[0] - r, center[1] - r] ] - ]))) + ]))); } describe('vector layer', function() { @@ -61,7 +61,7 @@ describe('ol.rendering.layer.Vector', function() { map.once('postrender', function() { expectResemble(map, 'spec/ol/layer/expected/vector-canvas.png', 17, done); - }) + }); }); });