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

Fix blocked_redirect by fixing promises and images #380

Merged
merged 5 commits into from May 8, 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

fix c2p image import

  • Loading branch information
christophertino committed May 7, 2019
commit b19b34117e390abc58fca1462552575a4d12308b
@@ -25,7 +25,7 @@
* @namespace BlockedRedirectContentScript
*/
import msgModule from './utils/msg';
import { ghosty_blocked, allow_once, allow_unblock } from '../data-images/click2play';
import c2p_images from '../data-images/click2play';

const msg = msgModule('blocked_redirect');
const { sendMessage, sendMessageInPromise } = msg;
@@ -90,9 +90,9 @@ const { sendMessage, sendMessageInPromise } = msg;
const { translations, blacklisted } = blockedRedirectData;
document.title = translations.blocked_redirect_page_title;
// Set data images
document.getElementById('ghosty_blocked').src = ghosty_blocked;
document.getElementById('allow_once').src = allow_once;
document.getElementById('allow_unblock').src = allow_unblock;
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
@@ -12,7 +12,7 @@ import ghostery_vkontakte from './ghostery_vkontakte';
import ghosty_blocked from './ghosty_blocked';
import ghosty_blocked_big from './ghosty_blocked_big';

export {
export default {
allow_once,
allow_unblock,
ghostery_facebook,
Binary file not shown.
Binary file not shown.
Binary file not shown.
ProTip! Use n and p to navigate between commits in a pull request.