Skip to content
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

force isWhitelisted to return bool #374

Merged
merged 2 commits into from Apr 24, 2019
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Next

force isWhitelisted to return bool

  • Loading branch information
christophertino committed Apr 24, 2019
commit 8454a935b5768bd8b0ea505f4cfc47ce57fc0b17
@@ -1,3 +1,8 @@
### GHOSTERY 8.3.3 (April 24, 2019)

+ Fixes bug where Ad-Blocker/Anti-Tracking modules did not respect whitelist settings
+ Fixes bug in category description names

### GHOSTERY 8.3.2 (April 22, 2019)

+ Ghostery tracker panel now updates dynamically in real time!
@@ -46,7 +46,7 @@
},
"dependencies": {
"base64-js": "^1.2.1",
"browser-core": "https://s3.amazonaws.com/cdncliqz/update/edge/ghostery/v7.35/7.35.1.1cf1ba2.tgz",
"browser-core": "https://s3.amazonaws.com/cdncliqz/update/edge/ghostery/v7.35/7.35.1.6e6eb11.tgz",
"classnames": "^2.2.5",
"d3": "^5.7.0",
"foundation-sites": "^6.4.4-rc1",
@@ -1245,8 +1245,9 @@ function initialiseWebRequestPipeline() {
* @return {boolean}
*/
function isWhitelisted(state) {
const url = state.sourceUrl;
return globals.SESSION.paused_blocking || events.policy.getSitePolicy(url) === 2 || state.ghosteryWhitelisted;
const url = state.tabUrl;
// state.ghosteryWhitelisted is sometimes undefined so force to bool
return Boolean(globals.SESSION.paused_blocking || events.policy.getSitePolicy(url) === 2 || state.ghosteryWhitelisted);
}

/**
@@ -1310,7 +1311,7 @@ adblocker.on('enabled', () => {
before: ['checkBlocklist']
}),
adblocker.action('addWhiteListCheck',
url => isWhitelisted({ sourceUrl: url }))
url => isWhitelisted({ tabUrl: url }))
])
);
});
@@ -1251,9 +1251,9 @@ brorand@^1.0.1:
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=

"browser-core@https://s3.amazonaws.com/cdncliqz/update/edge/ghostery/v7.35/7.35.1.1cf1ba2.tgz":
"browser-core@https://s3.amazonaws.com/cdncliqz/update/edge/ghostery/v7.35/7.35.1.6e6eb11.tgz":
version "7.35.1"
resolved "https://s3.amazonaws.com/cdncliqz/update/edge/ghostery/v7.35/7.35.1.1cf1ba2.tgz#3a6b14857c3e7b438ca581bbe6b25639dee9827c"
resolved "https://s3.amazonaws.com/cdncliqz/update/edge/ghostery/v7.35/7.35.1.6e6eb11.tgz#8a85e73ca945ae526ba00ecc1159eb56f26cc4b7"
dependencies:
"@cliqz-oss/dexie" "^2.0.4"
"@cliqz/adblocker" "^0.6.9"
ProTip! Use n and p to navigate between commits in a pull request.