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

[Szymon Kłos (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js         |    2 --
 loleaflet/src/map/handler/Map.TouchGesture.js |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fdb8ef87e1e7bdfa85bf8e134a7359ee4fbf90d5
Author:     Szymon KÅ‚os <szymon.klos at collabora.com>
AuthorDate: Mon Dec 9 10:28:53 2019 +0100
Commit:     Szymon KÅ‚os <szymon.klos at collabora.com>
CommitDate: Mon Dec 9 10:28:57 2019 +0100

    jsdialog: don't close on widget actions
    
    It will be closed always on tap on the document instead
    of on 'cursor change'. This will prevent us from hiding
    mobile wizard when user performed some action (eg. bold)
    and invalidatecursor message was received.
    
    Change-Id: I18faedb2a6c6317c547c1ed149923380cce4aa52

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 7a62ff8d8..0120036ea 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -532,7 +532,6 @@ L.TileLayer = L.GridLayer.extend({
 		}
 		else if (textMsg.startsWith('cellcursor:')) {
 			this._onCellCursorMsg(textMsg);
-			this._closeMobileWizard();
 		}
 		else if (textMsg.startsWith('celladdress:')) {
 			this._onCellAddressMsg(textMsg);
@@ -551,7 +550,6 @@ L.TileLayer = L.GridLayer.extend({
 		}
 		else if (textMsg.startsWith('invalidatecursor:')) {
 			this._onInvalidateCursorMsg(textMsg);
-			this._closeMobileWizard();
 		}
 		else if (textMsg.startsWith('invalidatetiles:')) {
 			var payload = textMsg.substring('invalidatetiles:'.length + 1);
diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js b/loleaflet/src/map/handler/Map.TouchGesture.js
index d406a2b3d..01544d5de 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -298,6 +298,8 @@ L.Map.TouchGesture = L.Handler.extend({
 			this._toolbar.remove();
 
 		this._map.fire('closepopups');
+		this._map.fire('closemobilewizard');
+
 		// unselect if anything is selected already
 		if (this._map._docLayer && this._map._docLayer._annotations && this._map._docLayer._annotations.unselect) {
 			this._map._docLayer._annotations.unselect();