Issue 2426 - Open block.html as a popup window

safari/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 161 matching lines @@
   }, true);
 
 
   /* Pages */
 
   var pages = Object.create(null);
   var pageCounter = 0;
 
   var Page = function(id, tab, url)
   {
-    this._id = id;
+    this.id = id;
     this._tab = tab;
     this._frames = [{url: new URL(url), parent: null}];
 
     if (tab.page)
       this._messageProxy = new ext._MessageProxy(tab.page);
     else
       // while the new tab page is shown on Safari 7, the 'page' property
       // of the tab is undefined, and we can't send messages to that page
       this._messageProxy = {
         handleRequest: function() {},
         handleResponse: function() {},
         sendMessage: function() {}
       };
 
     this.browserAction = new BrowserAction(this);
     this.contextMenus = new ContextMenus(this);
   };
   Page.prototype = {
     get url()
     {
       return this._frames[0].url;
     },
     sendMessage: function(message, responseCallback)
     {
-      this._messageProxy.sendMessage(message, responseCallback, {pageId: this._id});
+      this._messageProxy.sendMessage(message, responseCallback, {pageId: this.id});
     }
   };
 
-  ext._getPage = function(id)
+  ext.getPage = function(id)
   {
     return pages[id];
   };
 
   var isPageActive = function(page)
   {
     var tab = page._tab;
     var win = tab.browserWindow;
     return win && tab == win.activeTab && page == tab._visiblePage;
   };
 
   var forgetPage = function(id)
   {
+    ext.pages.onRemoved._dispatch(id);
+
     ext._removeFromAllPageMaps(id);
 
     delete pages[id]._tab._pages[id];
     delete pages[id];
   };
 
   var replacePage = function(page)
   {
     var tab = page._tab;
     tab._visiblePage = page;
 
     for (var id in tab._pages)
     {
-      if (id != page._id)
+      if (id != page.id)
         forgetPage(id);
     }
 
     if (isPageActive(page))
       updateToolbarItemForPage(page, tab.browserWindow);
   };
 
   var addPage = function(tab, url, prerendered)
   {
     var pageId = ++pageCounter;
@@ skipping 17 matching lines @@
   };
 
   ext.pages = {
     open: function(url, callback)
     {
       var tab = safari.application.activeBrowserWindow.openTab();
       tab.url = url;
 
       if (callback)
       {
-        var onLoading = function(page)
+        var onNavigate = function(event)
         {
-          if (page._tab == tab)
+          if (event.target == tab)
           {
-            ext.pages.onLoading.removeListener(onLoading);
-            callback(page);
+            safari.application.removeEventListener(onNavigate);
+            callback(tab._visiblePage);
           }
         };
-        ext.pages.onLoading.addListener(onLoading);
+
+        safari.application.addEventListener("navigate", onNavigate);
       }
     },
     query: function(info, callback)
     {
       var matchedPages = [];
 
       for (var id in pages)
       {
         var page = pages[id];
         var win = page._tab.browserWindow;
 
         if ("active" in info && info.active != isPageActive(page))
           continue;
         if ("lastFocusedWindow" in info && info.lastFocusedWindow != (win == safari.application.activeBrowserWindow))
           continue;
 
         matchedPages.push(page);
       };
 
       callback(matchedPages);
     },
     onLoading: new ext._EventTarget(),
     onActivated: new ext._EventTarget(),
+    onRemoved: new ext._EventTarget()
   };
 
   safari.application.addEventListener("close", function(event)
   {
     // this event is dispatched on closing windows and tabs. However when a
     // window is closed, it is first dispatched on each tab in the window and
     // then on the window itself. But we are only interested in closed tabs.
     if (!(event.target instanceof SafariBrowserTab))
       return;
 
@@ skipping 429 matching lines @@
       {
         tab.activate();
         if (callback)
           callback(page);
         return;
       }
     }
 
     ext.pages.open(optionsUrl, callback);
   };
+
+  /* Windows */
+  ext.windows = {
+    // Safari doesn't provide as rich a windows API as Chrome does, so instead
+    // of chrome.windows.create we have to fall back to just opening a new tab.
+    create: function(createData, callback)
+    {
+      if (createData)

[Sebastian Noack, 2016/02/17 20:44:06]

I'd simply assume that createData is given and has an URL. Note that the
behavior when createData is missing is inconsistent with Chrome anyway. On
Chrome this will open an empty window. But no reason, to cover a case that we
don't have.

Otherwise, LGTM. Feel free to push, after removing the check, here.

[kzar, 2016/02/17 20:52:21]

Done.

+        ext.pages.open(createData.url, callback);
+    }
+  };
 })();