[Libreoffice-commits] online.git: Branch 'feature/mobile-input' - 3 commits - loleaflet/src

[Michael Meeks (via logerrit)]

 loleaflet/src/control/Control.LokDialog.js    |    6 ------
 loleaflet/src/map/Map.js                      |    1 -
 loleaflet/src/map/handler/Map.TouchGesture.js |    3 +--
 3 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 110c90060720d284795c8ed51d0b42a9eadcf7ec
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Oct 3 14:34:00 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Oct 3 14:34:00 2019 +0100

    fixup f682135863f0c3a3909f940e23484529e9aaf46c
    
    Change-Id: I3f8b484f2f50188dd4af6d7891fc067244195f5c

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js b/loleaflet/src/map/handler/Map.TouchGesture.js
index eb24318a1..ae35507fa 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -242,8 +242,7 @@ L.Map.TouchGesture = L.Handler.extend({
 		if (this._state === L.Map.TouchGesture.MARKER || this._state === L.Map.TouchGesture.GRAPHIC) {
 			this._map._clipboardContainer.blur();
 		} else {
-			if (!this._map.hasFocus())
-				this._map.focus();
+			this._map.focus();
 		}
 	},
 
commit 5a44dbdaac9771e4fb5bc9490eb3348a75f9c214
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Oct 3 14:33:37 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Oct 3 14:33:37 2019 +0100

    fixup 82ba90659676fb1f42bc8c658920e25170fcf1f3
    
    Change-Id: I62fc9f78bf04a3d92cd54ee5fad336e3ccb03d23

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index cf1e37377..04fa1c0f8 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1201,7 +1201,6 @@ L.Map = L.Evented.extend({
 			return;
 		}
 
-		var message = '';
 		var map = this;
 		var inactiveMs = Date.now() - this.lastActiveTime;
 		var multiplier = 1;
commit 0161d1630958093556983ff0fd589b1b2a63bbf8
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Oct 3 14:33:06 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Oct 3 14:33:06 2019 +0100

    fixup b610b17f88bc94ed8ee98f59bf23a306380245a5
    
    Change-Id: Id769d66089ff5d9077b7e990a17bfe417844111c

diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index b2fd267a2..e4330455a 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -747,12 +747,6 @@ L.Control.LokDialog = L.Control.extend({
 		$('#sidebar-dock-wrapper').css({display: ''});
 	},
 
-	_postWindowGestureEvent: function(winid, type, x, y, offset) {
-		console.log('x ' + x + ' y ' + y + ' o ' + offset);
-		this._map._socket.sendMessage('windowgesture id=' + winid +  ' type=' + type +
-		                              ' x=' + x + ' y=' + y + ' offset=' + offset);
-	},
-
 	_onDialogClose: function(dialogId, notifyBackend) {
 		if (window.ThisIsTheiOSApp)
 			w2ui['editbar'].enable('closemobile');