From 5c9822111d538175ee8728f61a9fbfb530f4ac83 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 27 Nov 2017 19:14:31 +0100
Subject: [PATCH] Do not display notifications when popup is open (and remove
 traces)

---
 extras/chrome_extension/js/background.js | 16 +++++++++++-----
 extras/chrome_extension/js/options.js    |  7 -------
 extras/chrome_extension/js/popup.js      |  1 -
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/extras/chrome_extension/js/background.js b/extras/chrome_extension/js/background.js
index fafb53c5ca..2a1ce80656 100644
--- a/extras/chrome_extension/js/background.js
+++ b/extras/chrome_extension/js/background.js
@@ -65,11 +65,16 @@ function getEvents(reply){
 	// Discriminate the new events
 	newEvents=fetchNewEvents(fetchedEvents,storedEvents);
 	
-	// Display the notifications
-	for(var k=0;k<newEvents.length;k++){
-		localStorage["new_events"]++;
-		displayNotification (newEvents[k])
-		alertsSound(newEvents[k]);
+	// Display the notifications only if popup is not showing
+	var views = chrome.extension.getViews({ type: "popup" });
+	if (views.length == 0) {
+		for(var k=0;k<newEvents.length;k++){
+			localStorage["new_events"]++;
+			displayNotification (newEvents[k])
+			alertsSound(newEvents[k]);
+		}
+	} else {
+		localStorage["new_events"] = 0;
 	}
 
 	storedEvents = fetchedEvents;
@@ -114,6 +119,7 @@ function parseReplyEvents (reply) {
 	for(var i=0;i<e_array.length;i++){
 		// Avoid to parse empty lines
 		if (e_array[i].length == 0) continue;
+
 		var event=e_array[i].split(";");
 		fetchedEvents.push({
 			'id' : event[0],
diff --git a/extras/chrome_extension/js/options.js b/extras/chrome_extension/js/options.js
index 20084c46ff..220401e3e7 100644
--- a/extras/chrome_extension/js/options.js
+++ b/extras/chrome_extension/js/options.js
@@ -92,12 +92,6 @@ function disable(state){
 	}
 }
 
-function windowClose() {
-	//window.close();
-	console.log("close");
-}
-
-
 //Add callbacks to elements
 $(document).ready (function () {
 	
@@ -167,5 +161,4 @@ $(document).ready (function () {
 	$("#close").click (function () {
 		window.close();
 	});
-	
 });
diff --git a/extras/chrome_extension/js/popup.js b/extras/chrome_extension/js/popup.js
index 5bdbe966bd..0017e7f83f 100644
--- a/extras/chrome_extension/js/popup.js
+++ b/extras/chrome_extension/js/popup.js
@@ -64,7 +64,6 @@ function showError(text){
 function showEvents(){
 
 	clearError();
-	console.log("showEvents!!");
 	$('#events').empty();
 	var e_refr = document.getElementById('event_temp');
 	if(e_refr){