Issue 2426 - Open block.html as a popup window

chrome/ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 58 matching lines @@
            callback(new Page(openedTab));
          }
        };
        chrome.tabs.onUpdated.addListener(onUpdated);
      };
   }
 
   ext.pages = {
     open: function(url, callback)
     {
-      if (callback)
-        chrome.tabs.create({url: url}, afterTabLoaded(callback));

[Sebastian Noack, 2016/02/15 14:53:44]

Why didn't you go for |callback && afterTabLoaded(callback)| as I initially
suggested? Then if the callback isn't given, we pass in undefined which is the
same as omitting the argument, but we don't need to switch (and partly
duplicate) the logic here.

[kzar, 2016/02/15 15:46:06]

Done.

-      else
-        chrome.tabs.create({url: url});
+      chrome.tabs.create({url: url}, callback && afterTabLoaded(callback));
     },
     query: function(info, callback)
     {
       var rawInfo = {};
       for (var property in info)
       {
         switch (property)
         {
           case "active":
           case "lastFocusedWindow":
@@ skipping 497 matching lines @@
           ext.pages.open(optionsUrl, callback);
         }
       });
     });
   };
 
   /* Windows */
   ext.windows = {
     create: function(createData, callback)
     {
-      if (callback)

[Sebastian Noack, 2016/02/15 14:53:44]

It seems, creating a window without callback is a case that we don't have. So no
reason to add that additional boilerplate.

[kzar, 2016/02/15 15:46:06]

Done.

-        chrome.windows.create(createData, function(createdWindow)
-        {
-          afterTabLoaded(callback)(createdWindow.tabs[0]);
-        });
-      else
-        chrome.windows.create(createData);
+      chrome.windows.create(createData, function(createdWindow)
+      {
+        afterTabLoaded(callback)(createdWindow.tabs[0]);
+      });
     }
   };
 })();