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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 (function()
 {
   /* Pages */
 
   var Page = ext.Page = function(tab)
   {
-    this._id = tab.id;
+    this.id = tab.id;
     this._url = tab.url && new URL(tab.url);
 
     this.browserAction = new BrowserAction(tab.id);
     this.contextMenus = new ContextMenus(this);
   };
   Page.prototype = {
     get url()
     {
       // usually our Page objects are created from Chrome's Tab objects, which
       // provide the url. So we can return the url given in the constructor.
       if (this._url)
         return this._url;
 
       // but sometimes we only have the tab id when we create a Page object.
       // In that case we get the url from top frame of the tab, recorded by
       // the onBeforeRequest handler.
-      var frames = framesOfTabs[this._id];
+      var frames = framesOfTabs[this.id];
       if (frames)
       {
         var frame = frames[0];
         if (frame)
           return frame.url;
       }
     },
     sendMessage: function(message, responseCallback)
     {
-      chrome.tabs.sendMessage(this._id, message, responseCallback);
+      chrome.tabs.sendMessage(this.id, message, responseCallback);
     }
   };
 
-  ext._getPage = function(id)
+  ext.getPage = function(id)
   {
     return new Page({id: parseInt(id, 10)});
   };
 
+  function afterTabLoaded(callback)
+  {
+    if (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)
     {
-      if (callback)
-      {
-        chrome.tabs.create({url: url}, function(openedTab)
-        {
-          var onUpdated = function(tabId, changeInfo, tab)
-          {
-            if (tabId == openedTab.id && changeInfo.status == "complete")
-            {
-              chrome.tabs.onUpdated.removeListener(onUpdated);
-              callback(new Page(tab));
-            }
-          };
-          chrome.tabs.onUpdated.addListener(onUpdated);
-        });
-      }
-      else
-        chrome.tabs.create({url: url});
+      chrome.tabs.create({url: url}, afterTabLoaded(callback));

[Sebastian Noack, 2016/02/12 17:00:00]

I'd rather check here for the callback:

  callback && afterTabLoaded(callback)

That way we avoid one more block in afterTabLoaded() and in the function below
we assume the callback to be given anyway.

[kzar, 2016/02/13 14:18:12]

Done.

     },
     query: function(info, callback)
     {
       var rawInfo = {};
       for (var property in info)
       {
         switch (property)
         {
           case "active":
           case "lastFocusedWindow":
             rawInfo[property] = info[property];
         }
       }
 
       chrome.tabs.query(rawInfo, function(tabs)
       {
         callback(tabs.map(function(tab)
         {
           return new Page(tab);
         }));
       });
     },
     onLoading: new ext._EventTarget(),
-    onActivated: new ext._EventTarget()
+    onActivated: new ext._EventTarget(),
+    onRemoved: new ext._EventTarget()
   };
 
   chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
   {
     if (changeInfo.status == "loading")
       ext.pages.onLoading._dispatch(new Page(tab));
   });
 
   chrome.webNavigation.onBeforeNavigate.addListener(function(details)
   {
@@ skipping 17 matching lines @@
               url: details.url
             })
           );
         }
       });
     }
   });
 
   function forgetTab(tabId)
   {
+    ext.pages.onRemoved._dispatch(tabId);
+
     ext._removeFromAllPageMaps(tabId);
     delete framesOfTabs[tabId];
   }
 
   chrome.tabs.onReplaced.addListener(function(addedTabId, removedTabId)
   {
     forgetTab(removedTabId);
   });
 
   chrome.tabs.onRemoved.addListener(forgetTab);
 
-  chrome.tabs.onActivated.addListener(details =>
+  chrome.tabs.onActivated.addListener(function(details)
   {
     ext.pages.onActivated._dispatch(new Page({id: details.tabId}));
   });
 
 
   /* Browser actions */
 
   var BrowserAction = function(tabId)
   {
     this._tabId = tabId;
@@ skipping 103 matching lines @@
 
     chrome.tabs.query({active: true, lastFocusedWindow: true}, function(tabs)
     {
       chrome.contextMenus.removeAll(function()
       {
         contextMenuUpdating = false;
 
         if (tabs.length == 0)
           return;
 
-        var items = contextMenuItems.get({_id: tabs[0].id});
+        var items = contextMenuItems.get({id: tabs[0].id});
 
         if (!items)
           return;
 
         items.forEach(function(item)
         {
           chrome.contextMenus.create({
             title: item.title,
             contexts: item.contexts,
             onclick: function(info, tab)
@@ skipping 292 matching lines @@
           if (callback)
             callback(new Page(tab));
         }
         else
         {
           ext.pages.open(optionsUrl, callback);
         }
       });
     });
   };
+
+  /* Windows */
+  ext.windows = {
+    create: function(createData, callback)
+    {
+      chrome.windows.create(createData, function(createdWindow)
+      {
+        afterTabLoaded(callback)(createdWindow.tabs[0]);
+      });
+    }
+  };
 })();