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 82 matching lines @@
 
       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);

[Sebastian Noack, 2016/02/10 12:26:56]

I guess we should dispatch the event with a Page object for consistence.

[kzar, 2016/02/10 14:20:16]

I wasn't sure how well it would work using a Page object for a tab that had been
removed. (I nearly did return a Page object here initially.)

+
     ext._removeFromAllPageMaps(tabId);
     delete framesOfTabs[tabId];
   }
 
   chrome.tabs.onReplaced.addListener(function(addedTabId, removedTabId)
   {
     forgetTab(removedTabId);
   });
 
   chrome.tabs.onRemoved.addListener(forgetTab);
@@ skipping 428 matching lines @@
           if (callback)
             callback(new Page(tab));
         }
         else
         {
           ext.pages.open(optionsUrl, callback);
         }
       });
     });
   };
+
+  /* Windows */
+  ext.windows = {
+    create: (createData, callback) =>

[Sebastian Noack, 2016/02/10 12:26:56]

Nit: I'm not sure if using an arrow function is appropriate here, if it's just
for consistence with the rest of this file.

[kzar, 2016/02/10 14:20:16]

Done.

+    {
+      if (callback)

[Sebastian Noack, 2016/02/10 12:26:57]

The logic here is duplicated from ext.tabs.open. We should probably move it into
a common helper function.

[kzar, 2016/02/10 14:20:16]

Done.

+        chrome.windows.create(createData, createdWindow =>
+        {
+          let createdTab = createdWindow.tabs[0];
+          var onUpdated = (tabId, changeInfo, tab) =>
+          {
+            if (tabId == createdTab.id && changeInfo.status == "complete")
+            {
+              chrome.tabs.onUpdated.removeListener(onUpdated);
+              callback(new Page(createdTab));
+            }
+          };
+          chrome.tabs.onUpdated.addListener(onUpdated);
+        });
+      else
+        chrome.windows.create(createData);
+    }
+  };
 })();