[Libreoffice-commits] online.git: loleaflet/html

[Michael Meeks (via logerrit)]

 loleaflet/html/framed.doc.html |    7 ++++++-
 loleaflet/html/framed.html     |   11 +++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit e18fe5e5ef8ab1e6993d7864ff2ae5c2dd14aee8
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Jan 14 17:48:26 2020 +0000
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Jan 15 11:03:24 2020 +0100

    postMessage harness - extend to catch CSS issues.
    
    Change-Id: I0731ae72ba1937916b055882171785ee268e16c4
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86795
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/html/framed.doc.html b/loleaflet/html/framed.doc.html
index df68f69fe..76cf73648 100644
--- a/loleaflet/html/framed.doc.html
+++ b/loleaflet/html/framed.doc.html
@@ -158,11 +158,16 @@
     </form>
 
     <h3>Document frame</h3>
+    <h4>If the frame fails to load click <a id="link">here and accept security bits</a></h4>
     <iframe id="frame" height="1000" width="1000"></iframe>
 
+    <!-- 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 iframe = document.getElementById("frame");
-      iframe.src = "https://localhost:9980/loleaflet/42/loleaflet.html" + window.location.search + "&NotWOPIButIframe=true";
+      iframe.src = uriBase + "&NotWOPIButIframe=true";
+      var msg = document.getElementById("link");
+      link.href = uriBase;
     </script>
   </body>
 </html>
diff --git a/loleaflet/html/framed.html b/loleaflet/html/framed.html
index 036cc8019..b4f472622 100644
--- a/loleaflet/html/framed.html
+++ b/loleaflet/html/framed.html
@@ -196,13 +196,16 @@
 
     <h3>Document frame</h3>
 
-    <!-- The hostname and pathnames below are obviously specific to my
-    personal environment and need to be changed appropriately.  -->
-
+    <h4>If the frame fails to load click <a id="link">here and accept security bits</a></h4>
     <iframe id="frame" height="1000" width="1000"></iframe>
+
+    <!-- 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 iframe = document.getElementById("frame");
-      iframe.src = "https://localhost:9980/loleaflet/42/loleaflet.html" + window.location.search + "&NotWOPIButIframe=true";
+      iframe.src = uriBase + "&NotWOPIButIframe=true";
+      var msg = document.getElementById("link");
+      link.href = uriBase;
     </script>
   </body>
 </html>