[Libreoffice-commits] online.git: loleaflet/src
mert (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jun 25 20:37:20 UTC 2020
loleaflet/src/control/Toolbar.js | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit 94402959af480b2026c3f785e48f236e44bb0830
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: Thu Jun 25 22:37:01 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>
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 89c191294..7f24d3a55 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');
More information about the Libreoffice-commits
mailing list