From 6a4b42bafe90244663adc8f70fc96263bbc99e6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Wed, 4 Nov 2020 16:02:05 +0100
Subject: [PATCH] fix: display popup alertbox in hostnode view

Fix #112
---
 website/web/static/tree.js                | 3 ++-
 website/web/templates/hostname_popup.html | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/website/web/static/tree.js b/website/web/static/tree.js
index b76e474..3407690 100644
--- a/website/web/static/tree.js
+++ b/website/web/static/tree.js
@@ -63,9 +63,10 @@ function openTreeInNewTab(capture_uuid, hostnode_uuid=null) {
     }
     let win = window.open(url, '_blank');
     if (win == null) {
-        alert("The browser didn't allow Lookyloo to open a new tab. There should be an icon on the right of your URL bar to allow it.");
+        return false;
     }
     win.focus();
+    return true;
 }
 
 function open_hostnode_popup(hostnode_uuid) {
diff --git a/website/web/templates/hostname_popup.html b/website/web/templates/hostname_popup.html
index 9f2c1c2..64be22f 100644
--- a/website/web/templates/hostname_popup.html
+++ b/website/web/templates/hostname_popup.html
@@ -42,8 +42,13 @@
   });
   </script>
   <script>
-      let whereAmI = (hostnode_uuid) => window.opener.LocateNode(hostnode_uuid);
-      let openTreeInNewTab = (capture_uuid, hostnode_uuid=Null) => window.opener.openTreeInNewTab(capture_uuid, hostnode_uuid);
+    let whereAmI = (hostnode_uuid) => window.opener.LocateNode(hostnode_uuid);
+    let openTreeInNewTab = (capture_uuid, hostnode_uuid=Null) => {
+      let success = window.opener.openTreeInNewTab(capture_uuid, hostnode_uuid);
+      if (! success) {
+        alert("The browser didn't allow Lookyloo to open a new tab. There should be an icon on the right of your URL bar *in the main window* to allow it.");
+      }
+    }
   </script>
   <script>
   $(document).ready(() => {