loleaflet/src/control/Control.Menubar.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 4d934b01bf08ab7fe2fedcf5896a4664e5e6d308
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Oct 1 13:33:02 2019 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Oct 1 22:32:39 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 <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit a0c669d2ab3680c872552d890868dd74499ac92e)
Reviewed-on: https://gerrit.libreoffice.org/79998
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index f489f6324..dd2e92287 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -577,7 +577,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();
}
},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
