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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Tue Oct 1 10:41:29 UTC 2019


 loleaflet/src/control/Control.Menubar.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a165c2053dd47c0fbe1cbb86202e281072df7710
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Oct 1 12:07:08 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Oct 1 12:41:11 2019 +0200

    Revert "tdf#126972: The "file icon" button in the menubar is useless..."
    
    This reverts commit c5d6c7dd402da6987cd01f3c0759b28b3503d85c.
    
    We do want the logo to be there.
    
    Change-Id: I2378271e54cbe0763ad41c56b23c1b97a6d2a8ae
    Reviewed-on: https://gerrit.libreoffice.org/79950
    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 e3af7e8fa..e205d794c 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -568,7 +568,7 @@ L.Control.Menubar = L.Control.extend({
 		});
 		$('#main-menu').attr('tabindex', 0);
 
-		if (!window.ThisIsTheiOSApp && this._map._permission !== 'readonly') {
+		if (this._map._permission !== 'readonly') {
 			this._createFileIcon();
 		}
 	},


More information about the Libreoffice-commits mailing list