From e96dd14e0d0de7abe9ef87c48dac1c2366817be1 Mon Sep 17 00:00:00 2001
From: shortcutme <tamas@zeronet.io>
Date: Tue, 6 Mar 2018 12:01:21 +0100
Subject: [PATCH] Display wrapper security errors and fix Firefox navigation
 blank pages

---
 src/Ui/template/wrapper.html | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Ui/template/wrapper.html b/src/Ui/template/wrapper.html
index b91f2454..61efbd26 100644
--- a/src/Ui/template/wrapper.html
+++ b/src/Ui/template/wrapper.html
@@ -16,9 +16,19 @@
 </noscript>
 <script>
 // If we are inside iframe escape from it
-if (window.self !== window.top) window.open(window.location.toString(), "_top");
-if (window.self !== window.top || window.opener) window.stop();
-if ((window.self !== window.top || window.opener) && document.execCommand) document.execCommand("Stop", false)
+if (window.self !== window.top) {
+	window.open(window.location.toString(), "_top");
+	document.write("Escaping from iframe...");
+	window.stop();
+	document.execCommand("Stop", false);
+}
+
+// We are opened as a parent-window
+else if (window.opener && window.opener.location.toString()) {
+	document.write("Opened as child-window, stopping...");
+	window.stop();
+	document.execCommand("Stop", false);
+}
 </script>
 
 <div class="progressbar">