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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a0c669d2ab3680c872552d890868dd74499ac92e
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Oct 1 13:33:02 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 1 12:41:32 2019 +0200

    Show the logo also before the 'make-editable' button is clicked in the iOS app
    
    Change-Id: I69e3a8bfa467de295a23816aa2d0c43ec2aaf61a
    Reviewed-on: https://gerrit.libreoffice.org/79951
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index e205d794c..984585dde 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -568,7 +568,9 @@ L.Control.Menubar = L.Control.extend({
 		});
 		$('#main-menu').attr('tabindex', 0);
 
-		if (this._map._permission !== 'readonly') {
+		// The _createFileIcon function shows the Collabora logo in the iOS app case, no
+		// need to delay that until the document has been made editable.
+		if (window.ThisIsTheiOSApp || this._map._permission !== 'readonly') {
 			this._createFileIcon();
 		}
 	},