Issue 6476 - Update adblockplusui dependencies to ead38c2013b5

lib/options.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 99 matching lines @@
       {
         if (message.type != "app.listen")
           return;
 
         port.onMessage.removeListener(onMessage);
         callback(new ext.Page(tab), port);
       }
 
       function onConnect(port)
       {
-        let {name, sender} = port;

[Sebastian Noack, 2018/03/23 00:01:48]

Nit: I wouldn't care to destructure the port here, and just use port.name and
port.sender below.

[saroyanm, 2018/03/23 12:03:18]

Done.

-        if (name != "ui" || !sender || sender.tab.id != tab.id)

[Sebastian Noack, 2018/03/23 00:01:48]

Under which circumstances do we need to check for !sender?

[saroyanm, 2018/03/23 11:26:47]

I assume because this is optional, but according to the doc. this should be
presented on onConnect, I'll remove it.
Good point.

[saroyanm, 2018/03/23 12:03:17]

Done.

+        if (port.name != "ui" || port.sender.tab.id != tab.id)
           return;
 
         browser.runtime.onConnect.removeListener(onConnect);
         port.onMessage.addListener(onMessage);
       }
 
       browser.runtime.onConnect.addListener(onConnect);
     });
   }
 }
@@ skipping 71 matching lines @@
 {
   browser.tabs.query({active: true, lastFocusedWindow: true}, ([tab]) =>
   {
     let currentPage = new ext.Page(tab);
 
     showOptions((optionsPage, port) =>
     {
       if (!/^https?:$/.test(currentPage.url.protocol))
         return;
 
-        port.postMessage({

[Sebastian Noack, 2018/03/23 00:01:48]

Nit: The indentation is off here.

[saroyanm, 2018/03/23 12:03:18]

Done.

+      port.postMessage({
         type: "app.respond",
         action: "showPageOptions",
         args: [
           {
             host: getDecodedHostname(currentPage.url).replace(/^www\./, ""),
             whitelisted: !!checkWhitelisted(currentPage)
           }
         ]
       });
     });
   });
 });