loleaflet/src/control/Toolbar.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dd6ce865faf57cf02244710b27c5f18dc27427b4
Author: mert <mert.tu...@collabora.com>
AuthorDate: Thu May 28 14:54:14 2020 +0300
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu May 28 14:29:36 2020 +0200
Fix welcomedialog does not show-up
Change-Id: I38c2af5489b5557ef0cd8b944ba3b9cde316d693
Signed-off-by: mert <mert.tu...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95029
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 6798c620a..0409c9d1c 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 = window.host + window.serviceRoot +
'/welcome/welcome-' + String.locale + '.html';
+ var welcomeLocation = window.location.origin +
window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/')) +
'/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
