[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/layer/tile/GridLayer.js |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c302c79eab8aa089a58ec2ba411a3580355cda79
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Sep 26 22:15:18 2018 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Oct 1 12:19:16 2018 +0200

    loleaflet: Reset invalid counter when request new tiles by view change
    
    This invalidCount does not work perfectly, since we don't always
    send tile after every invalidation message (e.g. tile deduplication
    on severs side, wireID handling). So this invalidCount usage should
    be reconsidered. Now just avoid to have a tile still invalid after
    we requested (and get) the newest tile when we are changing the view.
    
    Change-Id: I249be63611767af02b04e142bb1c2afcb3a8eebb
    (cherry picked from commit b7f76d24fb49433c1d6d3b540a33530a482e6df3)
    Reviewed-on: https://gerrit.libreoffice.org/61123
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/layer/tile/GridLayer.js b/loleaflet/src/layer/tile/GridLayer.js
index a5860a9c0..067509d22 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -542,6 +542,9 @@ L.GridLayer = L.Layer.extend({
 				if (tile && tile.loaded && !invalid) {
 					tile.current = true;
 					newView = false;
+				} else if (invalid) {
+					tile._invalidCount = 1;
+					queue.push(coords);
 				} else {
 					queue.push(coords);
 				}