[Libreoffice-commits] online.git: loleaflet/src

[Jan Holesovsky]

 loleaflet/src/layer/tile/CalcTileLayer.js    |   19 ++++++++-----------
 loleaflet/src/layer/tile/ImpressTileLayer.js |   19 ++++++++-----------
 loleaflet/src/layer/tile/TileLayer.js        |    2 --
 loleaflet/src/layer/tile/WriterTileLayer.js  |   19 ++++++++-----------
 4 files changed, 24 insertions(+), 35 deletions(-)

New commits:
commit 786f1381a25e7ae938b4478aeffbbc3ae4cd6945
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Apr 29 15:45:34 2016 +0200

    bccu#1761: Revert "Don't send unneccesary "tilecombine" on multiple invalidates"
    
    This reverts commit 033a066ba7f76034008042d391f87607fff5a66c.

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js b/loleaflet/src/layer/tile/CalcTileLayer.js
index 517f86f..9b067f3 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -48,18 +48,15 @@ L.CalcTileLayer = L.TileLayer.extend({
 					this._tiles[key]._invalidCount = 1;
 				}
 				if (visibleArea.intersects(bounds)) {
-					if (!this._transientInvalidationKeys[key]) {
-						if (tilePositionsX !== '') {
-							tilePositionsX += ',';
-						}
-						tilePositionsX += tileTopLeft.x;
-						if (tilePositionsY !== '') {
-							tilePositionsY += ',';
-						}
-						tilePositionsY += tileTopLeft.y;
-						needsNewTiles = true;
-						this._transientInvalidationKeys[key] = true;
+					if (tilePositionsX !== '') {
+						tilePositionsX += ',';
 					}
+					tilePositionsX += tileTopLeft.x;
+					if (tilePositionsY !== '') {
+						tilePositionsY += ',';
+					}
+					tilePositionsY += tileTopLeft.y;
+					needsNewTiles = true;
 				}
 				else {
 					// tile outside of the visible area, just remove it
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 182afc1..3d2d58a 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -39,18 +39,15 @@ L.ImpressTileLayer = L.TileLayer.extend({
 					this._tiles[key]._invalidCount = 1;
 				}
 				if (visibleArea.intersects(bounds)) {
-					if (!this._transientInvalidationKeys[key]) {
-						if (tilePositionsX !== '') {
-							tilePositionsX += ',';
-						}
-						tilePositionsX += tileTopLeft.x;
-						if (tilePositionsY !== '') {
-							tilePositionsY += ',';
-						}
-						tilePositionsY += tileTopLeft.y;
-						needsNewTiles = true;
-						this._transientInvalidationKeys[key] = true;
+					if (tilePositionsX !== '') {
+						tilePositionsX += ',';
 					}
+					tilePositionsX += tileTopLeft.x;
+					if (tilePositionsY !== '') {
+						tilePositionsY += ',';
+					}
+					tilePositionsY += tileTopLeft.y;
+					needsNewTiles = true;
 				}
 				else {
 					// tile outside of the visible area, just remove it
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 34ff0c0..1b00baa 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -139,7 +139,6 @@ L.TileLayer = L.GridLayer.extend({
 		this._levels = {};
 		this._tiles = {};
 		this._tileCache = {};
-		this._transientInvalidationKeys = {};
 
 		map._fadeAnimated = false;
 		this._viewReset();
@@ -720,7 +719,6 @@ L.TileLayer = L.GridLayer.extend({
 	},
 
 	_onTileMsg: function (textMsg, img) {
-		this._transientInvalidationKeys = {};
 		var command = this._map._socket.parseServerCmd(textMsg);
 		var coords = this._twipsToCoords(command);
 		coords.z = command.zoom;
diff --git a/loleaflet/src/layer/tile/WriterTileLayer.js b/loleaflet/src/layer/tile/WriterTileLayer.js
index 5fdcb25..ee7b815 100644
--- a/loleaflet/src/layer/tile/WriterTileLayer.js
+++ b/loleaflet/src/layer/tile/WriterTileLayer.js
@@ -40,18 +40,15 @@ L.WriterTileLayer = L.TileLayer.extend({
 					this._tiles[key]._invalidCount = 1;
 				}
 				if (visibleArea.intersects(bounds)) {
-					if (!this._transientInvalidationKeys[key]) {
-						if (tilePositionsX !== '') {
-							tilePositionsX += ',';
-						}
-						tilePositionsX += tileTopLeft.x;
-						if (tilePositionsY !== '') {
-							tilePositionsY += ',';
-						}
-						tilePositionsY += tileTopLeft.y;
-						needsNewTiles = true;
-						this._transientInvalidationKeys[key] = true;
+					if (tilePositionsX !== '') {
+						tilePositionsX += ',';
 					}
+					tilePositionsX += tileTopLeft.x;
+					if (tilePositionsY !== '') {
+						tilePositionsY += ',';
+					}
+					tilePositionsY += tileTopLeft.y;
+					needsNewTiles = true;
 				}
 				else {
 					// tile outside of the visible area, just remove it