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

[mert (via logerrit)]

 loleaflet/html/loleaflet.html.m4 |    1 +
 loleaflet/js/global.js           |    1 +
 loleaflet/src/control/Toolbar.js |    3 +++
 3 files changed, 5 insertions(+)

New commits:
commit 8fa5d48a360ceddc09754a508866a91b85c63e9c
Author:     mert <mert.tumer at collabora.com>
AuthorDate: Wed May 20 17:17:44 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 20 16:40:12 2020 +0200

    Add "Slow Proxy" string in About
    
    Change-Id: I1c04ef295bdecf782e41d8e299adc67df4f87390
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94581
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 3b63c87ff..547c603c5 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -223,6 +223,7 @@ m4_ifelse(MOBILEAPP,[true],
       <h3>LOKit</h3>
       <div id="lokit-version"></div>
       m4_ifelse(MOBILEAPP,[],[<div id="os-info" style="text-align:center"></div>])
+      <div id="slow-proxy"></div>
       <p>Copyright © _YEAR_, VENDOR.</p>
     </div>
 
diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index 279f2b7c9..c867d28ff 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -426,6 +426,7 @@
 
 	global.createWebSocket = function(uri) {
 		if (global.socketProxy) {
+			window.socketProxy = true;
 			return new global.ProxySocket(uri);
 		} else {
 			return new WebSocket(uri);
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 8736ed0af..e01cef418 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -489,6 +489,9 @@ L.Map.include({
 			productNameWithURL = productName;
 		content.find('#product-string').html(productString.replace('%productName', productNameWithURL));
 
+		if (window.socketProxy)
+			content.find('#slow-proxy').text(_('"Slow Proxy"'));
+
 		var w;
 		var iw = window.innerWidth;
 		if (iw < 768) {