Issue 492 - Implemented popup blocking for Safari

chrome/ext/background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 32 matching lines @@
       {
         var frame = frames[0];
         if (frame)
           return frame.url;
       }
     },
     activate: function()
     {
       chrome.tabs.update(this._id, {selected: true});
     },
+    close: function()
+    {
+      chrome.tabs.remove(this._id);
+    },
     sendMessage: function(message, responseCallback)
     {
       chrome.tabs.sendMessage(this._id, message, responseCallback);
     }
   };
 
   ext.pages = {
     open: function(url, callback)
     {
       if (callback)
@@ skipping 28 matching lines @@
       }
 
       chrome.tabs.query(rawInfo, function(tabs)
       {
         callback(tabs.map(function(tab)
         {
           return new Page(tab);
         }));
       });
     },
-    onLoading: new ext._EventTarget()
+    onLoading: new ext._EventTarget(),
+    onPopup: new ext._EventTarget()
   };
 
+  var popups = {__proto__: null};
+
+  chrome.webNavigation.onCreatedNavigationTarget.addListener(function(details)
+  {
+    var frames = framesOfTabs[details.sourceTabId];
+    if (!frames)
+      return;
+
+    var openerFrame = frames[details.sourceFrameId];
+    if (!openerFrame)
+      return;
+
+    var page = new Page({id: details.tabId, url: details.url});
+    var opener = {page: new Page({id: details.sourceTabId}), frame: openerFrame};
+
+    popups[details.tabId] = opener;
+    ext.pages.onPopup._dispatch(page, opener);
+  });
+
   chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
   {
+    if (tabId in popups)
+    {
+      if ("url" in changeInfo)
+        ext.pages.onPopup._dispatch(new Page(tab), popups[tabId]);
+
+      if (changeInfo.status == "complete" && tab.url != "about:blank")
+        delete popups[tabId];
+    }
+
     if (changeInfo.status == "loading")
       ext.pages.onLoading._dispatch(new Page(tab));
   });
 
   chrome.webNavigation.onBeforeNavigate.addListener(function(details)
   {
     if (details.frameId == 0)
       ext._removeFromAllPageMaps(details.tabId);
   });
 
   chrome.tabs.onRemoved.addListener(function(tabId)
   {
     ext._removeFromAllPageMaps(tabId);
+
     delete framesOfTabs[tabId];
+    delete popups[tabId];
   });
 
 
   /* Browser actions */
 
   var BrowserAction = function(tabId)
   {
     this._tabId = tabId;
   };
   BrowserAction.prototype = {
@@ skipping 229 matching lines @@
     };
 
     return ext.onMessage._dispatch(message, sender, sendResponse);
   });
 
 
   /* Storage */
 
   ext.storage = localStorage;
 })();