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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Fri Sep 25 10:00:15 UTC 2020


 loleaflet/src/control/Control.Toolbar.js |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 32f33328d55fed1abfb0533ecee8496848931ded
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Sep 25 12:36:47 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 25 11:59:56 2020 +0200

    tdf#136457: Prevent tapping other UI elements after tapping the closebutton
    
    Change-Id: I925cd2d44f40ecca23fb51cbe2d2c6d15ecf9648
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103377
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index 3562e57fb..4aae10784 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -43,6 +43,15 @@ function getUNOCommand(unoData) {
 
 function onClose() {
 	if (window.ThisIsAMobileApp) {
+		// Hide stuff to avoid the user (even accidentally) tapping anything else right
+		// after tapping the closebutton, before the app has torn down the WebView.
+		// This is a silly workaround to avoid one possible way to reproduce tdf#136457.
+		$('#toolbar-wrapper').hide();
+		$('#closebuttonwrapper').hide();
+		$('#main-menu').hide();
+		$('#document-titlebar').hide();
+
+		// Then tell the app to delete the web view
 		window.postMobileMessage('BYE');
 	} else {
 		map.fire('postMessage', {msgId: 'close', args: {EverModified: map._everModified, Deprecated: true}});


More information about the Libreoffice-commits mailing list