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 39 matching lines @@
     {
       chrome.tabs.sendMessage(this.id, message, responseCallback);
     }
   };
 
   ext.getPage = function(id)
   {
     return new Page({id: parseInt(id, 10)});
   };
 
-  function afterTabLoaded(callback, getTab)
-  {
-    if (callback)
-    {
-      return function(openedTab)
-      {
-        if (getTab)
-          openedTab = getTab(openedTab);
-
-        var onUpdated = function(tabId, changeInfo, tab)
-        {
-          if (tabId == openedTab.id && changeInfo.status == "complete")
-          {
-            chrome.tabs.onUpdated.removeListener(onUpdated);
-            callback(new Page(openedTab));
-          }
-        };
-        chrome.tabs.onUpdated.addListener(onUpdated);
-      };
-    }
+  function afterTabLoaded(callback)
+  {
+     return function(openedTab)
+     {
+       var onUpdated = function(tabId, changeInfo, tab)
+       {
+         if (tabId == openedTab.id && changeInfo.status == "complete")
+         {
+           chrome.tabs.onUpdated.removeListener(onUpdated);
+           callback(new Page(openedTab));
+         }
+       };
+       chrome.tabs.onUpdated.addListener(onUpdated);
+     };
   }
 
   ext.pages = {
     open: function(url, callback)
     {
-      chrome.tabs.create({url: url}, afterTabLoaded(callback));
+      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)
     {
-      function getFirstTab(createdWindow)
-      {
-        return createdWindow.tabs[0];

[Sebastian Noack, 2016/02/10 14:43:24]

Why don't you simply pass the tab in instead of a callback?

[kzar, 2016/02/11 15:20:21]

Done.

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