Changes in response to PR requested changes.

app/content-scripts/click_to_play.js

@@ -162,20 +162,17 @@ const Click2PlayContentScript = (function (win, doc) {
 			}
 
 			const	{ name } = request;
-			const reqMsg = request.msg;
-
-			if (!reqMsg) {
-				return false;
-			}
-
 			log('click_to_play.js received message', name);
 
 			if (name === 'c2p') {
-				// queue Click-to-Play data so that we process multiple Twitter buttons at once, for example
-				C2P_DATA[reqMsg.app_id] = [reqMsg.app_id, reqMsg.data, reqMsg.html];
+				const reqMsg = request.message;
+				if (reqMsg) {
+					// queue Click-to-Play data so that we process multiple Twitter buttons at once, for example
+					C2P_DATA[reqMsg.app_id] = [reqMsg.app_id, reqMsg.data, reqMsg.html];
 
-				if (doc.readyState === 'complete') {
-					applyC2P(reqMsg.app_id, reqMsg.data, reqMsg.html);
+					if (doc.readyState === 'complete') {
+						applyC2P(reqMsg.app_id, reqMsg.data, reqMsg.html);
+					}
 				}
 			}
 

app/panel/components/Summary.jsx

@@ -303,7 +303,7 @@ class Summary extends React.Component {
 	render() {
 		const showBody = (!this.props.is_expanded || !this.props.is_expert);
 		const buttonDisabled = (this.state.disableBlocking || this.props.paused_blocking || this.props.sitePolicy !== false);
-		const alertText = this.props.paused_blocking ? t('enable_when_paused') : (this.props.sitePolicy === 1) ? t('enable_when_blacklisted') : (this.props.sitePolicy === 2) ? t('enable_when_whitelisted') : this.props.siteNotScanned ? t('enable_when_not_scanned') : '';
+		const alertText = this.props.paused_blocking ? t('enable_when_paused') : (this.props.sitePolicy === 1) ? t('enable_when_blacklisted') : (this.props.sitePolicy === 2) ? t('enable_when_whitelisted') : this.state.disableBlocking ? t('enable_when_not_scanned') : '';
 		const getTooltipClass = () => ((!this.props.is_expert && 'top')
 				|| ((this.props.is_expert && this.props.is_expanded) && 'right'));
 

src/classes/PanelData.js

@@ -348,7 +348,7 @@ class PanelData {
 			.set('pageHost', pageHost)
 			.set('performanceData', tab && tabInfo.getTabInfo(tab_id, 'pageTiming'))
 			.set('sitePolicy', tab && policy.getSitePolicy(tab_url) || false)
-			.set('siteNotScanned', tab && !trackerList.length || false)
+			.set('siteNotScanned', tab && !foundBugs.getApps(tab_id) || false)
 			.set('tab_id', tab_id)
 			.set('trackerCounts', tab && foundBugs.getAppsCountByBlocked(tab_id) || {})
 			.set('smartBlock', tabInfo.getTabInfo(tab_id, 'smartBlock'));