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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Fri Dec 6 08:33:10 UTC 2019


 loleaflet/src/core/Socket.js |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit b28b310e6e052806f8e29ea9fcd89b0907303a4e
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Dec 6 09:50:01 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Dec 6 09:32:52 2019 +0100

    There is no "server" in a mobile app
    
    Thus no "served by" information to display in Help>About.
    
    Change-Id: Ia4f91431536f5261c6cb0ee26398b9c33c0d0ea3
    Reviewed-on: https://gerrit.libreoffice.org/84596
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 4ce83df03..cdeeefe16 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -285,10 +285,12 @@ L.Socket = L.Class.extend({
 				$('#loolwsd-version').text(this.WSDServer.Version);
 			}
 
-			var idUri = this._map.options.server + this._map.options.serviceRoot + '/hosting/discovery';
-			idUri = idUri.replace(/^ws:/, 'http:');
-			idUri = idUri.replace(/^wss:/, 'https:');
-			$('#loolwsd-id').html(_('Served by:') + ' <a target="_blank" href="' + idUri + '">' + this.WSDServer.Id + '</a>');
+			if (!window.ThisIsAMobileApp) {
+				var idUri = this._map.options.server + this._map.options.serviceRoot + '/hosting/discovery';
+				idUri = idUri.replace(/^ws:/, 'http:');
+				idUri = idUri.replace(/^wss:/, 'https:');
+				$('#loolwsd-id').html(_('Served by:') + ' <a target="_blank" href="' + idUri + '">' + this.WSDServer.Id + '</a>');
+			}
 
 			// TODO: For now we expect perfect match in protocol versions
 			if (this.WSDServer.Protocol !== this.ProtocolVersionNumber) {


More information about the Libreoffice-commits mailing list