loleaflet/html/framed.doc.html | 2 +-
loleaflet/html/framed.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2185595629d1ea340ff0b7b4130578a86f5b8c1f
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Feb 10 20:34:09 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Feb 10 21:32:27 2020 +0100
make iframe load in http:// case, too
Change-Id: I22d8cfde29bac3db24dc3906c69fe119e5d40464
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88409
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loleaflet/html/framed.doc.html b/loleaflet/html/framed.doc.html
index 76cf73648..dd2666a54 100644
--- a/loleaflet/html/framed.doc.html
+++ b/loleaflet/html/framed.doc.html
@@ -163,7 +163,7 @@
<!-- 127.0.0.2 allows us to test CSS issues -->
<script>
- var uriBase = "https://127.0.0.2:9980/loleaflet/42/loleaflet.html"; +
window.location.search;
+ var uriBase = document.location.protocol +
"//127.0.0.2:9980/loleaflet/42/loleaflet.html" + window.location.search;
var iframe = document.getElementById("frame");
iframe.src = uriBase + "&NotWOPIButIframe=true";
var msg = document.getElementById("link");
diff --git a/loleaflet/html/framed.html b/loleaflet/html/framed.html
index b4f472622..110959f33 100644
--- a/loleaflet/html/framed.html
+++ b/loleaflet/html/framed.html
@@ -201,7 +201,7 @@
<!-- 127.0.0.2 allows us to test CSS issues -->
<script>
- var uriBase = "https://127.0.0.2:9980/loleaflet/42/loleaflet.html"; +
window.location.search;
+ var uriBase = document.location.protocol +
"//127.0.0.2:9980/loleaflet/42/loleaflet.html" + window.location.search;
var iframe = document.getElementById("frame");
iframe.src = uriBase + "&NotWOPIButIframe=true";
var msg = document.getElementById("link");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
