remove listener for offer shown + GH-1234

lint

change port name

app/content-scripts/rewards/HotDog.jsx

@@ -59,6 +59,7 @@ class HotDog extends Component {
 	}
 
 	close() {
+		this.props.actions.removeFocusListener();
 		this.props.actions.sendSignal('offer_closed_hotdog');
 		if (this.iframeEl) {
 			this.iframeEl.classList = '';

app/content-scripts/rewards/OfferCard.jsx

@@ -174,6 +174,7 @@ class OfferCard extends Component {
 	}
 
 	closeOfferCard() {
+		this.props.actions.removeFocusListener();
 		if (this.iframeEl) {
 			this.iframeEl.classList = '';
 		}

app/content-scripts/rewards/index.jsx

@@ -48,13 +48,17 @@ class RewardsApp {
 		this.mainView = null;
 		this.rewardsApp.id = 'ghostery-rewards-app';
 		this.rewardsApp.className = 'show';
+
 		this.handleMessages = this.handleMessages.bind(this);
 		this.sendSignal = this.sendSignal.bind(this);
 		this.messageBackground = this.messageBackground.bind(this);
+		this.removeFocusListener = this.removeFocusListener.bind(this);
+		this.focusListener = this.focusListener.bind(this);
 
 		this.actions = {
 			sendSignal: this.sendSignal,
-			messageBackground: this.messageBackground
+			messageBackground: this.messageBackground,
+			removeFocusListener: this.removeFocusListener
 		};
 
 		this.init();
@@ -193,10 +197,16 @@ class RewardsApp {
 		}
 	}
 
+	focusListener() {
+		this.sendSignal('offer_shown');
+	}
+
 	addRewardSeenListener() {
-		window.addEventListener('focus', () => {
-			this.sendSignal('offer_shown');
-		});
+		window.addEventListener('focus', this.focusListener);
+	}
+
+	removeFocusListener() {
+		window.removeEventListener('focus', this.focusListener);
 	}
 
 	messageBackground(name, message) {

app/panel/components/Rewards.jsx

@@ -50,6 +50,7 @@ class Rewards extends React.Component {
 	componentDidMount() {
 		this.props.actions.getRewardsData();
 		this.props.actions.sendSignal('hub_open');
+		chrome.runtime.connect({ name: 'rewardsPanelPort' });
 	}
 
 	/**

manifest.json

@@ -12,6 +12,8 @@
 	"version_name": "8.2.0",
 	"default_locale": "en",
 	"description": "__MSG_short_description__",
+	"debug": true,
+	"log": true,
 	"icons": {
 		"16": "app/images/icon16.png",
 		"48": "app/images/icon48.png",
@@ -99,4 +101,4 @@
 			"browser_action_next_to_addressbar": true
 		}
 	}
-}
+}

src/background.js

@@ -1267,6 +1267,14 @@ function initializeEventListeners() {
 
 	// Fired when a message is sent from either an extension process (by runtime.sendMessage) or a content script (by tabs.sendMessage).
 	onMessage.addListener(onMessageHandler);
+
+	// Fired when panel is disconnected
+	chrome.runtime.onConnect.addListener((port) => {
+		if (port && port.name === 'rewardsPanelPort') {
+			rewards.panelPort = port;
+			rewards.panelHubClosedListener();
+		}
+	});
 }
 
 /**

src/classes/Rewards.js

@@ -33,6 +33,7 @@ class Rewards {
 	constructor() {
 		this.getStoredOffers();
 		this.currentOffer = null;
+		this.panelPort = null;
 		this.ports = new Map();
 		this.channelsSupported = (typeof chrome.runtime.onConnect === 'object');
 	}
@@ -149,6 +150,17 @@ class Rewards {
 			return false;
 		});
 	}
+
+	panelHubClosedListener() {
+		this.panelPort.onDisconnect(() => {
+			this.sendSignal({
+				offerId: null,
+				actionId: 'hub_closed',
+				origin: 'ghostery-rewards-hub',
+				type: 'action-signal'
+			});
+		});
+	}
 }
 
 export default new Rewards();