summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2020-09-28 12:58:13 +0300
committerTor Lillqvist <tml@collabora.com>2020-09-28 17:48:07 +0200
commitccfc81dc020560c7d5287c098b85834003e8b89c (patch)
treece2cf6799f7460a984c0324724b3fcec29c279ea
parent18c57369643f95bcf449556666fcff9c53a5101b (diff)
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@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103551
-rw-r--r--loleaflet/src/control/Permission.js3
-rw-r--r--loleaflet/src/map/Map.js3
2 files changed, 6 insertions, 0 deletions
diff --git a/loleaflet/src/control/Permission.js b/loleaflet/src/control/Permission.js
index 6d4868919..4bef3b8dd 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 70f22c605..db096ab22 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1277,7 +1277,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');