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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Permission.js |    3 +++
 loleaflet/src/map/Map.js            |    3 +++
 2 files changed, 6 insertions(+)

New commits:
commit 21ef608f6d47b34cf5fc70072e74cec4986a5bba
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Sep 28 12:58:13 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Sep 28 14:18:49 2020 +0200

    tdf#136459: Show the spreadsheet formula input bar when switching to edit mode
    
    Factor out a code snippet from L.Map._onResize() into a function
    called showCalcInputBar(). Call that (in the iOS app in iPad case,
    which is what the bug is about) from L.Map._enterEditMode().
    
    Seems to work. No idea if this is the ideal solution.
    
    Change-Id: I29677201212b37ebb292591b217741d8301dfa15
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103542
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/src/control/Permission.js b/loleaflet/src/control/Permission.js
index 16ffe7742..57785cdcf 100644
--- a/loleaflet/src/control/Permission.js
+++ b/loleaflet/src/control/Permission.js
@@ -100,6 +100,9 @@ L.Map.include({
 			this.setZoom(10);
 		}
 
+		if (window.ThisIsTheiOSApp && window.mode.isTablet() && this._docLayer._docType === 'spreadsheet')
+			this.showCalcInputBar(0);
+
 		if (window.ThisIsTheAndroidApp)
 			window.postMobileMessage('EDITMODE on');
 	},
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 1a0e1e988..fc0dc3634 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1190,7 +1190,10 @@ L.Map = L.Evented.extend({
 				}
 			}
 		}
+		this.showCalcInputBar(deckOffset);
+	},
 
+	showCalcInputBar: function(deckOffset) {
 		if (this.dialog._calcInputBar && !this.dialog._calcInputBar.isPainting) {
 			var id = this.dialog._calcInputBar.id;
 			var calcInputbar = L.DomUtil.get('calc-inputbar');