From f6a192d5dc67e5c9d609cc944c571a98c2854adf Mon Sep 17 00:00:00 2001
From: Libor Polčák <ipolcak@fit.vutbr.cz>
Date: Oct 06 2021 14:02:21 +0000
Subject: Merge fixes for pop up communication with NBS


---

diff --git a/common/http_shield_common.js b/common/http_shield_common.js
index 607f840..293ef1d 100644
--- a/common/http_shield_common.js
+++ b/common/http_shield_common.js
@@ -475,7 +475,7 @@ function notifyBlockedRequest(origin, target, resource) {
 	 //Message came from popup,js, asking whether is this site whitelisted
 	 if (message === "is current site whitelisted?")
 	 {
-		 return Promise.resolve(`current site is ${checkWhitelist(site) ? '' : 'not '} whitelisted`);
+		 return Promise.resolve(`current site is ${checkWhitelist(site) ? '' : 'not '}whitelisted`);
 	 }
  }
  
diff --git a/common/popup.js b/common/popup.js
index 7b08eeb..2d2c9d1 100644
--- a/common/popup.js
+++ b/common/popup.js
@@ -142,7 +142,14 @@ async function load_on_off_switch()
 async function control_whitelist()
 {
 	let site = await getCurrentSite();
-	let message = `${document.getElementById("switch-checkbox").checked ? "remove" : "add"} site to whitelist`;
+	var message;
+	if (document.getElementById("switch-checkbox").checked) {
+		message = "remove site from whitelist";
+	}
+	else {
+		message = "add site to whitelist";
+	}
+	console.log(message);
 	browser.runtime.sendMessage({message, site});
 	showRefreshPageOption();
 }