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-2283/Ad-blocker-off-by-default-in-Dawn #693

Closed
wants to merge 10 commits into from
+14 −6
Closed

GH-2283/Ad-blocker-off-by-default-in-Dawn #693

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
30520aa
Default ad blocker to off on install in Dawn only
wlycdgr Feb 19, 2021
bcc2cf7
Move disabling of ad block in Dawn to guard against race condition
wlycdgr Feb 19, 2021
7cfefe1
Ensure that onboarding code does not switch ad block on by default
wlycdgr Feb 19, 2021
a2ce141
Change default enable_ad_block prop value to false in Dawn onboarding.
wlycdgr Feb 23, 2021
0f7adfa
Disable adblocker Cliqz module on startup
wlycdgr Feb 23, 2021
634ce2a
Reference ticket that motivates the Cliqz adblocker deactivation
wlycdgr Feb 23, 2021
68ae62e
Do not turn off ad blocker in background
wlycdgr Feb 23, 2021
2feaf28
Hardcode allowing Bing Ads bugs through
wlycdgr Feb 23, 2021
c6cfdd6
Only deactivate Cliqz adblocker module on startup if extension has ju…
wlycdgr Feb 23, 2021
31cf928
update prefs to disable ad-blocker
christophertino Feb 23, 2021
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…

Move disabling of ad block in Dawn to guard against race condition

  • Loading branch information
@wlycdgr
wlycdgr committed Feb 19, 2021
commit bcc2cf787823628a03b8a95188bf218927673395
4 src/background.js
View file
Open in desktop
@@ -1548,6 +1548,9 @@ function initializeGhosteryModules() {
// Make sure that getBrowserInfo() has resolved before we set these properties
(async() => {
await globals.BROWSER_INFO_READY;
if (globals.JUST_INSTALLED && BROWSER_INFO.name === 'ghostery_desktop') { // i.e., Dawn
conf.enable_ad_block = false; // GH-2283
}
if (IS_FIREFOX && BROWSER_INFO.name !== 'ghostery_desktop' && BROWSER_INFO.name !== 'ghostery_android') {
if (globals.JUST_INSTALLED) {
conf.enable_human_web = false;
@@ -1636,7 +1639,6 @@ function initializeGhosteryModules() {
(async() => {
await globals.BROWSER_INFO_READY;
if (BROWSER_INFO.name === 'ghostery_desktop') { // i.e., Dawn
conf.enable_ad_block = false; // GH-2283
chrome.tabs.create({
url: chrome.runtime.getURL('./app/templates/dawn_hub.html?justInstalled=true'),
active: true
ProTip! Use n and p to navigate between commits in a pull request.