From fabcb313f14e06034828512b1603151e1400f4e6 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Thu, 21 Feb 2013 15:11:09 +0100 Subject: [PATCH] Satisfy JSLint JSLint complains about functions being declared in blocks. --- src/ol/renderer/canvas/canvastilelayerrenderer.js | 4 ++-- src/ol/renderer/dom/domtilelayerrenderer.js | 4 ++-- src/ol/renderer/webgl/webgltilelayerrenderer.js | 4 ++-- src/ol/source/tiledwmssource.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js index e7c48f044ca..3e55fec20d0 100644 --- a/src/ol/renderer/canvas/canvastilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js @@ -129,9 +129,9 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame = var tilesToDrawByZ = {}; tilesToDrawByZ[z] = {}; - function isLoaded(tile) { + var isLoaded = function(tile) { return !goog.isNull(tile) && tile.getState() == ol.TileState.LOADED; - } + }; var findLoadedTiles = goog.bind(tileSource.findLoadedTiles, tileSource, tilesToDrawByZ, isLoaded); diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js index faeb67d47d0..b6157b40d48 100644 --- a/src/ol/renderer/dom/domtilelayerrenderer.js +++ b/src/ol/renderer/dom/domtilelayerrenderer.js @@ -93,9 +93,9 @@ ol.renderer.dom.TileLayer.prototype.renderFrame = var tilesToDrawByZ = {}; tilesToDrawByZ[z] = {}; - function isLoaded(tile) { + var isLoaded = function(tile) { return !goog.isNull(tile) && tile.getState() == ol.TileState.LOADED; - } + }; var findLoadedTiles = goog.bind(tileSource.findLoadedTiles, tileSource, tilesToDrawByZ, isLoaded); diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js index 53405ca10ae..83efd39c398 100644 --- a/src/ol/renderer/webgl/webgltilelayerrenderer.js +++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js @@ -365,10 +365,10 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame = var tilesToDrawByZ = {}; tilesToDrawByZ[z] = {}; - function isLoaded(tile) { + var isLoaded = function(tile) { return !goog.isNull(tile) && tile.getState() == ol.TileState.LOADED && mapRenderer.isTileTextureLoaded(tile); - } + }; var findLoadedTiles = goog.bind(tileSource.findLoadedTiles, tileSource, tilesToDrawByZ, isLoaded); diff --git a/src/ol/source/tiledwmssource.js b/src/ol/source/tiledwmssource.js index b09147cf2cd..a1093f21e43 100644 --- a/src/ol/source/tiledwmssource.js +++ b/src/ol/source/tiledwmssource.js @@ -69,7 +69,7 @@ ol.source.TiledWMS = function(tiledWMSOptions) { tileUrlFunction = ol.TileUrlFunction.nullTileUrlFunction; } - function tileCoordTransform(tileCoord) { + var tileCoordTransform = function(tileCoord) { if (tileGrid.getResolutions().length <= tileCoord.z) { return null; } @@ -90,7 +90,7 @@ ol.source.TiledWMS = function(tiledWMSOptions) { return null; } return new ol.TileCoord(tileCoord.z, x, tileCoord.y); - } + }; goog.base(this, { attributions: tiledWMSOptions.attributions,