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

[Tor Lillqvist]

 loleaflet/src/layer/tile/CalcTileLayer.js    |    2 +-
 loleaflet/src/layer/tile/ImpressTileLayer.js |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 13fcb10f91dfbf5c7cc276996a765af8e814d050
Author: Tor Lillqvist <t...@collabora.com>
Date:   Thu Jan 12 13:14:19 2017 +0200

    Do the oldhash thing for Impress documents, too
    
    (Copy-pasta here, too.)
    
    Change-Id: I0327889d05a8d7294499849cb0a2b2dcca60ecff

diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js 
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 496fa91..3f20f56 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -28,6 +28,7 @@ L.ImpressTileLayer = L.TileLayer.extend({
 
                var tilePositionsX = '';
                var tilePositionsY = '';
+               var oldHashes = '';
                var needsNewTiles = false;
 
                for (var key in this._tiles) {
@@ -51,6 +52,15 @@ L.ImpressTileLayer = L.TileLayer.extend({
                                                tilePositionsY += ',';
                                        }
                                        tilePositionsY += tileTopLeft.y;
+                                       if (oldHashes !== '') {
+                                               oldHashes += ',';
+                                       }
+                                       if (this._tiles[key].oldhash === 
undefined) {
+                                               oldHashes += '0';
+                                       }
+                                       else {
+                                               oldHashes += 
this._tiles[key].oldhash;
+                                       }
                                        needsNewTiles = true;
                                        if (this._debug) {
                                                
this._debugAddInvalidationData(this._tiles[key]);
@@ -73,7 +83,8 @@ L.ImpressTileLayer = L.TileLayer.extend({
                                'tileposx=' + tilePositionsX + ' ' +
                                'tileposy=' + tilePositionsY + ' ' +
                                'tilewidth=' + this._tileWidthTwips + ' ' +
-                               'tileheight=' + this._tileHeightTwips;
+                               'tileheight=' + this._tileHeightTwips + ' ' +
+                               'oldhash=' + oldHashes;
 
                        this._map._socket.sendMessage(message, '');
                        if (this._debug) {
commit b35d708006a64bc13797e39646bdc51818a88872
Author: Tor Lillqvist <t...@collabora.com>
Date:   Thu Jan 12 13:12:34 2017 +0200

    Bin superfluous semicolon
    
    Change-Id: I2319ef9badfa50f645af3bedd2a589de61f6d2b3

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index b120e16..02747de 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -100,7 +100,7 @@ L.CalcTileLayer = L.TileLayer.extend({
                                'tileposy=' + tilePositionsY + ' ' +
                                'tilewidth=' + this._tileWidthTwips + ' ' +
                                'tileheight=' + this._tileHeightTwips + ' ' +
-                               'oldhash=' + oldHashes;;
+                               'oldhash=' + oldHashes;
 
                        this._map._socket.sendMessage(message, '');
                        if (this._debug) {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits