diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a9657386..4a76d5234 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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! diff --git a/manifest.json b/manifest.json index 4ec457b83..d109d8f58 100644 --- a/manifest.json +++ b/manifest.json @@ -9,8 +9,8 @@ "author": "Ghostery", "name": "__MSG_name__", "short_name": "Ghostery", - "version": "8.3.2", - "version_name": "8.3.2", + "version": "8.3.3", + "version_name": "8.3.3", "default_locale": "en", "description": "__MSG_short_description__", "icons": { diff --git a/package.json b/package.json index 1ab07f5fd..5ca07c07a 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/background.js b/src/background.js index 04f16a06e..431048a25 100644 --- a/src/background.js +++ b/src/background.js @@ -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 })) ]) ); }); diff --git a/yarn.lock b/yarn.lock index c4f07a7ab..e5a1a40f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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"