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

[Marco Cecchetti]

 loleaflet/src/control/Control.Header.js   |   18 ------------------
 loleaflet/src/layer/tile/CalcTileLayer.js |    6 ++++--
 2 files changed, 4 insertions(+), 20 deletions(-)

New commits:
commit 62021b4f7642b1e264fd90f06ffcfa4b81bf92d2
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Mon Dec 18 21:55:46 2017 +0100

    loleaflet: calc: removed unused function
    
    Change-Id: I0dc6b7b60ab1af2e6d77ac8b8a79fc6ad56f68b8
    Reviewed-on: https://gerrit.libreoffice.org/46745
    Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
    Tested-by: Marco Cecchetti <mrcekets at gmail.com>

diff --git a/loleaflet/src/control/Control.Header.js b/loleaflet/src/control/Control.Header.js
index 8593052d..ad8edec3 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -503,24 +503,6 @@ L.Control.Header = L.Control.extend({
 		}
 	},
 
-	_getGroupLevelHeader: function (pos) {
-		if (!this._groups)
-			return;
-
-		var levels = this._groups.length + 1;
-		var size = this._levelSpacing + this._groupHeadSize;
-
-		var level = (pos + 1) / size | 0;
-		var relPos = pos % size;
-
-		if (level < this._groups.length && relPos > this._levelSpacing) {
-			return level;
-		}
-		else {
-			return -1;
-		}
-	},
-
 	_computeOutlineWidth: function () {
 		return this._levelSpacing + (this._groupHeadSize + this._levelSpacing) * (this._groups.length + 1);
 	},
commit ba20cd134136a101960552f9432fb3f5969868cd
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Mon Dec 18 21:50:37 2017 +0100

    loleaflet: calc: wrong data in firing of updaterowcolumnheaders event
    
    two fixes:
    
    - wrong data in firing of updaterowcolumnheaders event (messing up
    pg-up/pg-down)
    
    - console error message about invocation of a method for an undefined
    object (annotation.mark)
    
    Change-Id: I4e7d9de38ffe18b477c99147966fd91d7a460841
    Reviewed-on: https://gerrit.libreoffice.org/46744
    Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
    Tested-by: Marco Cecchetti <mrcekets at gmail.com>

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js b/loleaflet/src/layer/tile/CalcTileLayer.js
index c628bfb8..d0296b15 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -211,7 +211,7 @@ L.CalcTileLayer = L.TileLayer.extend({
 			this._map.fire('updaterowcolumnheaders', {x: 0, y: this._map._getTopLeftPoint().y, offset: {x: 0, y: undefined}});
 			this._map._socket.sendMessage('commandvalues command=.uno:ViewAnnotationsPosition');
 		} else if (textMsg.startsWith('invalidateheader: all')) {
-			this._map.fire('updaterowcolumnheaders', {x: this._map._getTopLeftPoint().x, y: this._map._getTopLeftPoint(), offset: {x: undefined, y: undefined}});
+			this._map.fire('updaterowcolumnheaders', {x: this._map._getTopLeftPoint().x, y: this._map._getTopLeftPoint().y, offset: {x: undefined, y: undefined}});
 			this._map._socket.sendMessage('commandvalues command=.uno:ViewAnnotationsPosition');
 		} else {
 			L.TileLayer.prototype._onMessage.call(this, textMsg, img);
@@ -469,7 +469,9 @@ L.CalcTileLayer = L.TileLayer.extend({
 				var annotation = this._annotations[comment.tab][comment.id];
 				if (annotation) {
 					annotation.setLatLngBounds(comment.cellPos);
-					annotation.mark.setLatLng(comment.cellPos.getNorthEast());
+					if (annotation.mark) {
+						annotation.mark.setLatLng(comment.cellPos.getNorthEast());
+					}
 				}
 			}
 			this.showAnnotations();