Refactored the abstraction layer to address prerendered pages on Safari caused by leaky abstraction

notification.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * 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
  * 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/>.
  */
+
+//This case is true only for chrome when loading from notification.html
+if (typeof ext === "undefined")
+{
+  var ext = chrome.extension.getBackgroundPage().ext;
+}
 
 var backgroundPage = ext.backgroundPage.getWindow();
 var require = backgroundPage.require;
 
 var Utils = require("utils").Utils;
 var Notification = require("notification").Notification;
 
 function getDocLinks(notification)
 {
   if (!notification.links)
@@ skipping 31 matching lines @@
 
   insertMessage(element, after, links);
 }
 
 window.addEventListener("load", function()
 {
   var notification = backgroundPage.activeNotification;
   if (!notification)
     return;
 
-  if (notification.onClicked)
-    notification.onClicked();
-
   var texts = Notification.getLocalizedTexts(notification);
   var titleElement = document.getElementById("notification-title");
   titleElement.textContent = texts.title;
 
   var docLinks = getDocLinks(notification);
   var messageElement = document.getElementById("notification-message");
   insertMessage(messageElement, texts.message, docLinks);
 
   messageElement.addEventListener("click", function(event)
   {
     var link = event.target;
     while (link && link !== messageElement && link.localName !== "a")
       link = link.parentNode;
     if (!link)
       return;
     event.preventDefault();
     event.stopPropagation();
-        ext.pages.open(link.href);

[Wladimir Palant, 2014/04/04 14:00:35]

Please use spaces for indentation.

[Sebastian Noack, 2014/04/07 13:15:25]

Done.

+    ext.pages.open(link.href);
   });
 
+  if (notification.type == "question")
+  {
+    document.getElementById("notification-question").addEventListener("click", function(event)
+    {
+      event.preventDefault();
+      event.stopPropagation();
+      
+      var approved = false;
+      switch (event.target.id)
+      {
+        case "notification-yes":
+          approved = true;
+        case "notification-no":
+          Notification.triggerQuestionListeners(notification.id, approved);
+          Notification.markAsShown(notification.id);
+          notification.onClicked();
+          break;
+      }
+      window.close();
+    }, true);
+  }
+
   var notificationElement = document.getElementById("notification");
-  notificationElement.className = notification.severity;
+  notificationElement.className = notification.type;
   notificationElement.style.display = "block";
-});
+  
+  document.getElementById("close-notification").addEventListener("click", function()
+  {
+    notificationElement.style.display = "none";
+    notification.onClicked();
+  }, false);
+}, false);