From 587568edfe6da65c6ec261b06cb3cdbfd3b99dbe Mon Sep 17 00:00:00 2001 From: Serge Zarembsky Date: Mon, 26 Mar 2018 17:39:40 -0400 Subject: [PATCH 1/4] Added checks for non-null message --- app/content-scripts/click_to_play.js | 4 ++++ app/content-scripts/notifications.js | 3 +++ 2 files changed, 7 insertions(+) diff --git a/app/content-scripts/click_to_play.js b/app/content-scripts/click_to_play.js index 0102ff95d..f8dadae8c 100644 --- a/app/content-scripts/click_to_play.js +++ b/app/content-scripts/click_to_play.js @@ -164,6 +164,10 @@ 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') { diff --git a/app/content-scripts/notifications.js b/app/content-scripts/notifications.js index 23332fbfe..936b40bfd 100644 --- a/app/content-scripts/notifications.js +++ b/app/content-scripts/notifications.js @@ -733,6 +733,9 @@ const NotificationsContentScript = (function (win, doc) { ]; const { name } = request; const reqMsg = request.message; + if(!reqMsg) { + return false; + } log('notifications.js received message', name); From dde6adb86995404b090a53f95e419be675def0c0 Mon Sep 17 00:00:00 2001 From: Serge Zarembsky Date: Wed, 28 Mar 2018 14:17:36 -0400 Subject: [PATCH 2/4] Fixing GH-872 --- app/content-scripts/click_to_play.js | 2 +- app/content-scripts/notifications.js | 2 +- src/classes/PanelData.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/content-scripts/click_to_play.js b/app/content-scripts/click_to_play.js index f8dadae8c..b7bfff87c 100644 --- a/app/content-scripts/click_to_play.js +++ b/app/content-scripts/click_to_play.js @@ -164,7 +164,7 @@ const Click2PlayContentScript = (function (win, doc) { const { name } = request; const reqMsg = request.msg; - if(!reqMsg) { + if (!reqMsg) { return false; } diff --git a/app/content-scripts/notifications.js b/app/content-scripts/notifications.js index 936b40bfd..10475896b 100644 --- a/app/content-scripts/notifications.js +++ b/app/content-scripts/notifications.js @@ -733,7 +733,7 @@ const NotificationsContentScript = (function (win, doc) { ]; const { name } = request; const reqMsg = request.message; - if(!reqMsg) { + if (!reqMsg) { return false; } diff --git a/src/classes/PanelData.js b/src/classes/PanelData.js index 5732171c2..a46fa7f65 100644 --- a/src/classes/PanelData.js +++ b/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 && !foundBugs.getApps(tab_id) || false) + .set('siteNotScanned', tab && !trackerList.length || false) .set('tab_id', tab_id) .set('trackerCounts', tab && foundBugs.getAppsCountByBlocked(tab_id) || {}) .set('smartBlock', tabInfo.getTabInfo(tab_id, 'smartBlock')); From 355487edd39b29d26595be94219d1f0e3c874744 Mon Sep 17 00:00:00 2001 From: Serge Zarembsky Date: Fri, 30 Mar 2018 11:57:55 -0400 Subject: [PATCH 3/4] Changes in response to PR requested changes. --- app/content-scripts/click_to_play.js | 17 +++++++---------- app/panel/components/Summary.jsx | 2 +- src/classes/PanelData.js | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/app/content-scripts/click_to_play.js b/app/content-scripts/click_to_play.js index b7bfff87c..b4c994012 100644 --- a/app/content-scripts/click_to_play.js +++ b/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); + } } } diff --git a/app/panel/components/Summary.jsx b/app/panel/components/Summary.jsx index 930efb2d5..53011911b 100644 --- a/app/panel/components/Summary.jsx +++ b/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')); diff --git a/src/classes/PanelData.js b/src/classes/PanelData.js index a46fa7f65..5732171c2 100644 --- a/src/classes/PanelData.js +++ b/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')); From 6e62d5fa25abd5da88a64ce882cccfc6f47e4093 Mon Sep 17 00:00:00 2001 From: Serge Zarembsky Date: Tue, 3 Apr 2018 10:18:15 -0400 Subject: [PATCH 4/4] Requested changes. --- app/content-scripts/click_to_play.js | 9 ++++----- app/content-scripts/notifications.js | 24 ++++++++++-------------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/app/content-scripts/click_to_play.js b/app/content-scripts/click_to_play.js index b4c994012..96a7c1fd1 100644 --- a/app/content-scripts/click_to_play.js +++ b/app/content-scripts/click_to_play.js @@ -161,17 +161,16 @@ const Click2PlayContentScript = (function (win, doc) { return false; } - const { name } = request; + const { name, message } = request; log('click_to_play.js received message', name); if (name === 'c2p') { - const reqMsg = request.message; - if (reqMsg) { + if (message) { // 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]; + C2P_DATA[message.app_id] = [message.app_id, message.data, message.html]; if (doc.readyState === 'complete') { - applyC2P(reqMsg.app_id, reqMsg.data, reqMsg.html); + applyC2P(message.app_id, message.data, message.html); } } } diff --git a/app/content-scripts/notifications.js b/app/content-scripts/notifications.js index 10475896b..41256e0ae 100644 --- a/app/content-scripts/notifications.js +++ b/app/content-scripts/notifications.js @@ -731,11 +731,7 @@ const NotificationsContentScript = (function (win, doc) { 'showCMPMessage', 'showBrowseWindow' ]; - const { name } = request; - const reqMsg = request.message; - if (!reqMsg) { - return false; - } + const { name, message } = request; log('notifications.js received message', name); @@ -747,29 +743,29 @@ const NotificationsContentScript = (function (win, doc) { } if (name === 'showCMPMessage') { - CMP_DATA = reqMsg.data; + CMP_DATA = message.data; showAlert('showCMPMessage', { campaign: CMP_DATA }); ALERT_SHOWN = true; } else if (name === 'showUpgradeAlert') { - NOTIFICATION_TRANSLATIONS = reqMsg.translations; - LANGUAGE = reqMsg.language || 'en'; - showAlert('showUpgradeAlert', reqMsg.major_upgrade); + NOTIFICATION_TRANSLATIONS = message.translations; + LANGUAGE = message.language || 'en'; + showAlert('showUpgradeAlert', message.major_upgrade); ALERT_SHOWN = true; } else if (name === 'showLibraryUpdateAlert') { - NOTIFICATION_TRANSLATIONS = reqMsg.translations; - LANGUAGE = reqMsg.language || 'en'; + NOTIFICATION_TRANSLATIONS = message.translations; + LANGUAGE = message.language || 'en'; showAlert('showLibraryUpdateAlert'); ALERT_SHOWN = true; // Import/Export related messages } else if (name === 'showBrowseWindow') { - showBrowseWindow(reqMsg.translations); + showBrowseWindow(message.translations); ALERT_SHOWN = true; } else if (name === 'onFileImported') { - updateBrowseWindow(reqMsg); + updateBrowseWindow(message); } else if (name === 'exportFile') { - exportFile(reqMsg); + exportFile(message); } // trigger a response callback to src/background so that we can handler errors properly