[Libreoffice-commits] online.git: loleaflet/html loleaflet/src

[Tor Lillqvist (via logerrit)]

 loleaflet/html/loleaflet.html.m4 |    3 ++-
 loleaflet/src/map/Map.js         |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 888b31ad8617dde4ea51015c1e5126de529a91e0
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Jul 6 13:31:30 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Jul 6 13:24:28 2020 +0200

    Revert "Return early in L.Map.showBusy() in the iOS app, too"
    
    Instead, set brandProductName from the MOBILEAPPNAME. Now the mobile
    app name shows up in the progress bar.
    
    This reverts commit 24a0c7c3dccb5005f5d2f0ee02a88a989870a922.
    
    Change-Id: I91c7ea3d21f5362fc6a4d777b041089413e921ee
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98205
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 79c4ce2e7..6aebc2321 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -43,7 +43,8 @@ m4_ifelse(MOBILEAPP,[true],
    window.open = function (url, windowName, windowFeatures) {
      window.postMobileMessage('HYPERLINK ' + url); /* don't call the 'normal' window.open on mobile at all */
    }
-   window.MobileAppName='MOBILEAPPNAME';],
+   window.MobileAppName='MOBILEAPPNAME';
+   brandProductName='MOBILEAPPNAME';],
   [   window.ThisIsAMobileApp = false;]
 )
 m4_ifelse(IOSAPP,[true],
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index b02638aaf..0cd8f9282 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -445,7 +445,7 @@ L.Map = L.Evented.extend({
 	},
 
 	showBusy: function(label, bar) {
-		if (window.ThisIsTheAndroidApp || window.ThisIsTheiOSApp)
+		if (window.ThisIsTheAndroidApp)
 			return;
 
 		// If document is already loaded, ask the toolbar widget to show busy