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

GH-1566 - Smart blocking should check for Click2Play #388

Merged
merged 9 commits into from Jun 11, 2019
+119 −215
Merged

GH-1566 - Smart blocking should check for Click2Play #388

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7aadb55
GH-1566 adjust smart blocking to handle click 2 play
christophertino May 30, 2019
f9b1618
Merge branch 'develop' into feature/GH-1566
jsignanini Jun 11, 2019
80d7c46
Add c2p entry check to shouldBlock for smart block policy.
jsignanini Jun 11, 2019
50dc5a1
Implement c2p allow once for lazy loading trackers.
jsignanini Jun 11, 2019
1f71d11
fix typo.
jsignanini Jun 11, 2019
80c917a
Destructure underscore lib imports.
jsignanini Jun 11, 2019
93f3d7c
Destructure underscore lib imports in front-end.
jsignanini Jun 11, 2019
3e395a5
Remove unused condition.
jsignanini Jun 11, 2019
0207e99
update comment on buildC2P
christophertino Jun 11, 2019
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…

Add c2p entry check to shouldBlock for smart block policy.

  • Loading branch information
@jsignanini
jsignanini committed Jun 11, 2019
commit 80d7c46e103feb5f82bd774baeef70597e9c192c
4 src/classes/PolicySmartBlock.js
View file
Open in desktop
@@ -122,6 +122,7 @@ class PolicySmartBlock {
* 3. Page is neither whitelisted or blacklisted
* 4. Tracker is not site-specific unblocked
* 5. Tracker is not site-specific blocked
* 6. Tracker does not have entry in Click2Play
*
* @param {number} tabId tab id
* @param {string | boolean} appId tracker id
@@ -136,7 +137,8 @@ class PolicySmartBlock {
!globals.SESSION.paused_blocking &&
!this.policy.getSitePolicy(tabUrl) &&
((appId && (!conf.site_specific_unblocks.hasOwnProperty(tabHost) || !conf.site_specific_unblocks[tabHost].includes(+appId))) || appId === false) &&
((appId && (!conf.site_specific_blocks.hasOwnProperty(tabHost) || !conf.site_specific_blocks[tabHost].includes(+appId))) || appId === false)
((appId && (!conf.site_specific_blocks.hasOwnProperty(tabHost) || !conf.site_specific_blocks[tabHost].includes(+appId))) || appId === false) &&
!c2pDb.db.apps.hasOwnProperty(appId)
);
}

ProTip! Use n and p to navigate between commits in a pull request.