Issue 6420 - Fixed poping up whitelisted website notification for several custom filter lists

ext/content.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 56 matching lines @@
   browser.runtime.sendMessage = (message, responseCallback) =>
   {
     let messageId = ++maxMessageId;
 
     ext.backgroundPage._sendRawMessage({
       type: "message",
       messageId,
       payload: message
     });
 
+    let resolvePromise = null;

[saroyanm, 2018/03/05 20:28:33]

I noticed that it took me longer than needed to implement the Error handling in
current Mock, if you would like me to do that in current review please let me
know, but otherwise this should work for now.

[Thomas Greiner, 2018/03/06 13:08:47]

We're not handling errors yet so we don't need to worry about adding that
capability to the mock at this point either.

+    let callbackWrapper = event =>
+    {
+      if (event.data.type == "response" && event.data.messageId == messageId)
+      {
+        window.removeEventListener("message", callbackWrapper);
+        resolvePromise(event.data.payload);
+      }
+    };
+    window.addEventListener("message", callbackWrapper);
     if (responseCallback)
     {
-      let callbackWrapper = event =>
+      resolvePromise = responseCallback;
+    }
+    else
+    {
+      return new Promise((resolve, reject) =>
       {
-        if (event.data.type == "response" && event.data.messageId == messageId)
-        {
-          window.removeEventListener("message", callbackWrapper);
-          responseCallback(event.data.payload);
-        }
-      };
-
-      window.addEventListener("message", callbackWrapper);
+        resolvePromise = resolve;
+      });
     }
   };
 }());