loleaflet/src/control/Toolbar.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3bb8754ef1b8208f7594aaa35364980662ee3dce
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Thu May 14 14:33:46 2020 +0100
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Thu May 14 18:12:22 2020 +0200
Welcome: include the host + service-root.
Also fixes proxy usage.
Change-Id: I118101077b6294c3720af47f0188326ace9bbc09
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94212
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index a1bc47d8d..8736ed0af 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -414,7 +414,7 @@ L.Map.include({
showWelcomeDialog: function(calledFromMenu) {
console.log('showWelcomeDialog, calledFromMenu: ' +
calledFromMenu);
- var welcomeLocation = 'welcome/welcome-' + String.locale +
'.html';
+ var welcomeLocation = window.host + window.serviceRoot +
'welcome/welcome-' + String.locale + '.html';
var map = this;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
