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

[Pranam Lashkari (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit c568472cc47ebb333aaf064d54e39526a8ed7fc7
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Fri Aug 28 02:03:29 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Aug 28 12:05:44 2020 +0200

    leaflet: use vex dialog to modify comments in calc mobile
    
    Change-Id: I7c76c3cb9b5438f010752933db45f30899068d4c
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101460
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js b/loleaflet/src/layer/tile/CalcTileLayer.js
index 11d0a4709..371e344bc 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -72,8 +72,13 @@ L.CalcTileLayer = L.TileLayer.extend({
 	},
 
 	onAnnotationModify: function (annotation) {
-		annotation.edit();
-		annotation.focus();
+		if (window.mode.isMobile() || window.mode.isTablet()) {
+			var that = this;
+			this.newAnnotationVex(annotation, function(annotation) { that._onAnnotationSave(annotation); }, /* isMod */ true);
+		} else {
+			annotation.edit();
+			annotation.focus();
+		}
 	},
 
 	onAnnotationRemove: function (id) {