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

[mert (via logerrit)]

 loleaflet/src/control/Toolbar.js |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 2440b6209ed4934ee6af71ef8f5a87b1af71fd30
Author:     mert <mert.tumer at collabora.com>
AuthorDate: Thu Jun 25 18:53:39 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Jun 26 10:28:09 2020 +0200

    Fix images are not shown in online help page on proxy
    
    Relative urls must be replaced for proxy
    
    Change-Id: Ia1d888941c33736c4eb19070aec73c5bdd6fa197
    Signed-off-by: mert <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97166
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 29c92b5c8db5b470facf09b19811805a9ea69192)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97138

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 1ce90a3ba..6f76e0540 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -254,6 +254,15 @@ L.Map.include({
 						}
 					} else /* id === 'online-help' */ {
 						document.getElementById('keyboard-shortcuts').style.display='none';
+						if (window.socketProxy) {
+							var helpdiv = document.getElementById('online-help');
+							var imgList = helpdiv.querySelectorAll('img');
+							for (var p = 0; p < imgList.length; p++) {
+								var imgSrc = imgList[p].src;
+								imgSrc = imgSrc.substring(imgSrc.indexOf('/images'));
+								imgList[p].src = window.host + window.serviceRoot + '/loleaflet/dist'+ imgSrc;
+							}
+						}
 						// Display help according to document opened
 						if (map.getDocType() === 'text') {
 							var x = document.getElementsByClassName('text');