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

[Grzegorz Araminowicz (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit af6fe6a2f09e1b36093206e6048188d6cb9e6a6a
Author:     Grzegorz Araminowicz <grzegorz.araminowicz at collabora.com>
AuthorDate: Mon Nov 25 18:40:05 2019 +0100
Commit:     Grzegorz Araminowicz <grzegorz.araminowicz at collabora.com>
CommitDate: Mon Nov 25 18:42:17 2019 +0100

    remove duplicated condition
    
    Change-Id: If96be0eb426371f9a146def406cd002e241a56e8
    Reviewed-on: https://gerrit.libreoffice.org/83705
    Reviewed-by: Grzegorz Araminowicz <grzegorz.araminowicz at collabora.com>
    Tested-by: Grzegorz Araminowicz <grzegorz.araminowicz at collabora.com>

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 9ae10c84d..85c82b826 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2012,12 +2012,12 @@ L.TileLayer = L.GridLayer.extend({
 		var cursorPos = this._visibleCursor.getNorthWest();
 		var docLayer = this._map._docLayer;
 
-		if ((!zoom && scroll !== false) && !this._map.getBounds().contains(this._visibleCursor) && this._isCursorVisible) {
+		if (!zoom && scroll !== false && !this._map.getBounds().contains(this._visibleCursor) && this._isCursorVisible) {
 			var center = this._map.project(cursorPos);
 			center = center.subtract(this._map.getSize().divideBy(2));
 			center.x = Math.round(center.x < 0 ? 0 : center.x);
 			center.y = Math.round(center.y < 0 ? 0 : center.y);
-			if (!zoom && !(this._selectionHandles.start && this._selectionHandles.start.isDragged) &&
+			if (!(this._selectionHandles.start && this._selectionHandles.start.isDragged) &&
 			    !(this._selectionHandles.end && this._selectionHandles.end.isDragged) &&
 			    !(docLayer._followEditor || docLayer._followUser)) {
 				this._map.fire('scrollto', {x: center.x, y: center.y, calledFromInvalidateCursorMsg: scroll !== undefined});