loleaflet/src/layer/tile/CanvasTileLayer.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
New commits: commit b21f0c37cae85c696fc8f4172bd758b504dc7dd0 Author: Dennis Francis <dennis.fran...@collabora.com> AuthorDate: Fri Aug 7 17:48:50 2020 +0530 Commit: Dennis Francis <dennis.fran...@collabora.com> CommitDate: Wed Aug 12 10:23:40 2020 +0200 loleaflet: decrement _emptyTilesCount when tile is ready... ... and also move the 'statusindicator' event generation code. Change-Id: Ifdd9eb26d58986ce5fea8ea19f7dc7576d12743e Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100484 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Dennis Francis <dennis.fran...@collabora.com> diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js b/loleaflet/src/layer/tile/CanvasTileLayer.js index 57ebab698..3e86d3f0f 100644 --- a/loleaflet/src/layer/tile/CanvasTileLayer.js +++ b/loleaflet/src/layer/tile/CanvasTileLayer.js @@ -868,6 +868,16 @@ L.CanvasTileLayer = L.TileLayer.extend({ tile = this._tiles[key]; if (!tile) { return; } + var emptyTilesCountChanged = false; + if (this._emptyTilesCount > 0) { + this._emptyTilesCount -= 1; + emptyTilesCountChanged = true; + } + + if (emptyTilesCountChanged && this._emptyTilesCount === 0) { + this._map.fire('statusindicator', { statusType: 'alltilesloaded' }); + } + tile.loaded = +new Date(); tile.active = true; @@ -1342,12 +1352,6 @@ L.CanvasTileLayer = L.TileLayer.extend({ if (this._tiles[key]._invalidCount > 0) { this._tiles[key]._invalidCount -= 1; } - if (!tile.loaded) { - this._emptyTilesCount -= 1; - if (this._emptyTilesCount === 0) { - this._map.fire('statusindicator', { statusType: 'alltilesloaded' }); - } - } tile.el.src = img; } L.Log.log(textMsg, 'INCOMING', key); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits