Skip to content

/ ghostery-extension

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for GH-872, "Not Scanned" case. #15

Merged
merged 5 commits into from Apr 3, 2018
+18 −19
Merged

Fix for GH-872, "Not Scanned" case. #15

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
587568e
Added checks for non-null message
Mar 26, 2018
dde6adb
Fixing GH-872
Mar 28, 2018
355487e
Changes in response to PR requested changes.
Mar 30, 2018
6e62d5f
Requested changes.
Apr 3, 2018
795a120
Merge remote-tracking branch 'upstream/develop' into develop
Apr 3, 2018
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
Loading status checks…

Fixing GH-872

  • Loading branch information
Serge Zarembsky
Serge Zarembsky committed Mar 28, 2018
commit dde6adb86995404b090a53f95e419be675def0c0
2 app/content-scripts/click_to_play.js
View file
Open in desktop
@@ -164,7 +164,7 @@ const Click2PlayContentScript = (function (win, doc) {
const { name } = request;
const reqMsg = request.msg;

if(!reqMsg) {
if (!reqMsg) {
return false;
}

2 app/content-scripts/notifications.js
View file
Open in desktop
@@ -733,7 +733,7 @@ const NotificationsContentScript = (function (win, doc) {
];
const { name } = request;
const reqMsg = request.message;
if(!reqMsg) {
if (!reqMsg) {
return false;
}

This comment has been minimized.

Sign in to view
@jsignanini

jsignanini Mar 30, 2018
Member

@zarembsky let's investigate why request.message is coming in as undefined here.

2 src/classes/PanelData.js
View file
Open in desktop
@@ -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)

This comment has been minimized.

Sign in to view
@jsignanini

jsignanini Mar 30, 2018
Member

@zarembsky foundBugs.getApps() returns 3 states, false for page not scanned, [] for page scanned but found no trackers, and [tracker, tracker, ...] for page scanned and trackers were found. So we should leave this as it was.
.set('trackerCounts', tab && foundBugs.getAppsCountByBlocked(tab_id) || {})
.set('smartBlock', tabInfo.getTabInfo(tab_id, 'smartBlock'));
ProTip! Use n and p to navigate between commits in a pull request.