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

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.LokDialog.js |   32 +++++++++++++----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

New commits:
commit c3ffb4562f0912655464d9996c157af9d2f72ccf
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon May 20 15:31:53 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu May 23 15:19:16 2019 +0200

    Allow to use pan gesture on desktop
    
    Change-Id: Ifbc6102407add31f63b1be0173c5c8eeb3e8e2db
    Reviewed-on: https://gerrit.libreoffice.org/72843
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index b1ea6b54e..3ecb68773 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -668,24 +668,22 @@ L.Control.LokDialog = L.Control.extend({
 
 		zoomTargets.push({key: targetId, value: zoomTarget, transformation: transformation, initialState: state});
 
-		if (window.mode.isMobile() || window.mode.isTablet()) {
-			var hammerAll = new Hammer(canvas);
-			hammerAll.add(new Hammer.Pan({ threshold: 0, pointers: 0 }));
-			hammerAll.add(new Hammer.Pinch({ threshold: 0 })).recognizeWith([hammerAll.get('pan')]);
-
-			hammerAll.on('panstart panmove', this.onPan);
-			hammerAll.on('pinchstart pinchmove', this.onPinch);
-			hammerAll.on('hammer.input', function(ev) {
-				if (ev.isFinal) {
-					var id = toZoomTargetId(ev.target.id);
-					var target = findZoomTarget(id);
-					if (target) {
-						target.initialState.startX = target.transformation.translate.x;
-						target.initialState.startY = target.transformation.translate.y;
-					}
+		var hammerAll = new Hammer(canvas);
+		hammerAll.add(new Hammer.Pan({ threshold: 0, pointers: 0 }));
+		hammerAll.add(new Hammer.Pinch({ threshold: 0 })).recognizeWith([hammerAll.get('pan')]);
+
+		hammerAll.on('panstart panmove', this.onPan);
+		hammerAll.on('pinchstart pinchmove', this.onPinch);
+		hammerAll.on('hammer.input', function(ev) {
+			if (ev.isFinal) {
+				var id = toZoomTargetId(ev.target.id);
+				var target = findZoomTarget(id);
+				if (target) {
+					target.initialState.startX = target.transformation.translate.x;
+					target.initialState.startY = target.transformation.translate.y;
 				}
-			});
-		}
+			}
+		});
 
 		updateTransformation(findZoomTarget(targetId));
 	},