diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a76d5234..115a7a140 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### GHOSTERY 8.3.4 (May 8, 2019) + ++ Fixes bug in Click2Play redirect blocking + ### GHOSTERY 8.3.3 (April 24, 2019) + Fixes bug where Ad-Blocker/Anti-Tracking modules did not respect whitelist settings diff --git a/app/content-scripts/blocked_redirect.js b/app/content-scripts/blocked_redirect.js index 0e6ac5cf6..0a4185f1a 100644 --- a/app/content-scripts/blocked_redirect.js +++ b/app/content-scripts/blocked_redirect.js @@ -25,6 +25,7 @@ * @namespace BlockedRedirectContentScript */ import msgModule from './utils/msg'; +import c2p_images from '../data-images/click2play'; const msg = msgModule('blocked_redirect'); const { sendMessage, sendMessageInPromise } = msg; @@ -88,6 +89,11 @@ const { sendMessage, sendMessageInPromise } = msg; APP_ID = blockedRedirectData.app_id; const { translations, blacklisted } = blockedRedirectData; document.title = translations.blocked_redirect_page_title; + // Set data images + document.getElementById('ghosty_blocked').src = c2p_images.ghosty_blocked; + document.getElementById('allow_once').src = c2p_images.allow_once; + document.getElementById('allow_unblock').src = c2p_images.allow_unblock; + // Set translated titles document.getElementById('redirect-prevent').innerHTML = translations.blocked_redirect_prevent; document.getElementById('action-always').firstChild.title = translations.blocked_redirect_action_always_title; // firstChild should be the action_always image document.getElementById('action-through-once').firstChild.title = translations.blocked_redirect_action_through_once_title; // firstChild should be the action_always image diff --git a/app/content-scripts/utils/msg.js b/app/content-scripts/utils/msg.js index 5608c2650..12fe568d8 100644 --- a/app/content-scripts/utils/msg.js +++ b/app/content-scripts/utils/msg.js @@ -33,7 +33,7 @@ export default function (origin) { * @return {Promise} response or null */ function sendMessageInPromise(name, message) { - panelSendPromiseMessage(name, message, origin); + return panelSendPromiseMessage(name, message, origin); } /** diff --git a/app/data-images/click2play/index.js b/app/data-images/click2play/index.js index b10cfb769..db6f6952e 100644 --- a/app/data-images/click2play/index.js +++ b/app/data-images/click2play/index.js @@ -26,4 +26,4 @@ export default { ghostery_vkontakte, ghosty_blocked, ghosty_blocked_big, -} \ No newline at end of file +} diff --git a/app/panel/utils/msg.js b/app/panel/utils/msg.js index 39e1d7a41..3ac8904dd 100644 --- a/app/panel/utils/msg.js +++ b/app/panel/utils/msg.js @@ -81,7 +81,7 @@ export function sendMessageInPromise(name, message, origin = '') { }); }); } - return new Promise(((resolve) => { + return new Promise((resolve) => { chrome.runtime.sendMessage({ name, message, @@ -93,7 +93,7 @@ export function sendMessageInPromise(name, message, origin = '') { } resolve(response); }); - })); + }); } /** diff --git a/app/templates/blocked_redirect.html b/app/templates/blocked_redirect.html index d229b0714..2b2ce63b0 100644 --- a/app/templates/blocked_redirect.html +++ b/app/templates/blocked_redirect.html @@ -50,9 +50,9 @@