From 69ae9aef4503a12c239a56dabf9eec78e6156c96 Mon Sep 17 00:00:00 2001 From: Caleb Richelson Date: Tue, 7 May 2019 15:47:56 -0400 Subject: [PATCH] Fix blocked_redirect by fixing promises and images --- app/content-scripts/utils/msg.js | 2 +- app/images/click2play/allow_always.png | Bin 0 -> 607 bytes app/images/click2play/allow_once.png | Bin 0 -> 468 bytes app/images/click2play/ghostery_blocked.png | Bin 0 -> 15877 bytes app/panel/utils/msg.js | 4 ++-- app/templates/blocked_redirect.html | 6 +++--- 6 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 app/images/click2play/allow_always.png create mode 100644 app/images/click2play/allow_once.png create mode 100644 app/images/click2play/ghostery_blocked.png 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/images/click2play/allow_always.png b/app/images/click2play/allow_always.png new file mode 100644 index 0000000000000000000000000000000000000000..8449546b94d49ee32f462bd18ed3cf38b2ef0520 GIT binary patch literal 607 zcmV-l0-*hgP)w$)X zumUv)E5pH;KN-IK{)f$=4?sK-Xix)8fDvj~K!FzDdLtn=hUqsy zKREvS=K-K_0?6Q6J$?pBPG*LzlkdP5AOVn?M4(|0Fk;zMgnd59u%grN7xbG6D*}ZU zg2bPH{|i>c!^#9U6v}5$#76x8c zuxBO!aU;;65BMTQVCS>%2lhSxu@PMoTRoiEdQn zVfg^W`NSq0ff_x5en~E7hVyTKG4Snr@!-?%e}+JD5C(-&K(rE1{jt|SJ}kEv`#?v+Y@h&41CZ^2oTZ302nGNG3;;MT*pc`5oxK16002ovPDHLkV1naP`_ljb literal 0 HcmV?d00001 diff --git a/app/images/click2play/allow_once.png b/app/images/click2play/allow_once.png new file mode 100644 index 0000000000000000000000000000000000000000..44fe136c88c4da3bfe4f2c5fc741882a2c985618 GIT binary patch literal 468 zcmV;_0W1EAP)r$d z^~ra1sRdBOK44greDwAG|488TufPAZPQ3Yl>*FstKXBj6|3HiX6H3@%*KK+H4Q?37 z5SZq(Z-2tYSKR*s66+@>QXD{G1_P3u%nUX9n5C8~A1jF3NOCOmure_i39(U>Yz~}z z`-`B$+n;`es0T!u8gk$jN~C}QdZa`ie6^owXM!T8c9foNF|7R?`sH3$X(0t^5^(FjfnDz!ua0000< KMNUMnLSTYRXuF31 literal 0 HcmV?d00001 diff --git a/app/images/click2play/ghostery_blocked.png b/app/images/click2play/ghostery_blocked.png new file mode 100644 index 0000000000000000000000000000000000000000..21ed3a286cbda29b3226816e15196699fefb38e5 GIT binary patch literal 15877 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 literal 0 HcmV?d00001 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..e8dd57593 100644 --- a/app/templates/blocked_redirect.html +++ b/app/templates/blocked_redirect.html @@ -50,9 +50,9 @@

- - - + + +