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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Toolbar.js |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ec686a3d5f415932a0d9e5ab804dd1ca89ad8598
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Dec 6 09:46:42 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Dec 6 09:33:56 2019 +0100

    Don't show a link for the product name in Help>About on iOS
    
    The app's WKWebView is not configured to allow opening web pages, so
    it won't work anyway. When clicking the link the app will crash with
    "Terminating app due to uncaught exception
    'NSInternalInconsistencyException', reason: 'Returned WKWebView was
    not created with the given configuration.'"
    
    Change-Id: Iac05b74087331d6f3a0405e76f4323316af4729a
    Reviewed-on: https://gerrit.libreoffice.org/84595
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 65a74ecef..e2289a748 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -361,8 +361,12 @@ L.Map.include({
 		var productURL = (typeof brandProductURL !== 'undefined') ? brandProductURL : 'https://libreoffice.org';
 		content.find('#product-name').text(productName);
 		var productString = _('This version of %productName is powered by');
-		var productNameWithURL = '<a href="' + sanitizeUrl.sanitizeUrl(productURL) +
+		var productNameWithURL;
+		if (!window.ThisIsTheiOSApp)
+			productNameWithURL = '<a href="' + sanitizeUrl.sanitizeUrl(productURL) +
 								 '" target="_blank">' + productName + '</a>';
+		else
+			productNameWithURL = productName;
 		content.find('#product-string').html(productString.replace('%productName', productNameWithURL));
 
 		var w;