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 257 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;
@@ skipping 460 matching lines @@
 
     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)
-        ext.pages.open(createData.url, callback);
+      ext.pages.open(createData.url, callback);
     }
   };
 })();