Issue 2656 - Fixed notification shown in popup

notification.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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/>.
  */
 
 var backgroundPage = ext.backgroundPage.getWindow();
 var require = backgroundPage.require;
 
 var Utils = require("utils").Utils;
 var Notification = require("notification").Notification;
+var getActiveNotification = require("notificationHelper").getActiveNotification;
 
 function getDocLinks(notification)
 {
   if (!notification.links)
     return [];
 
   var docLinks = [];
   notification.links.forEach(function(link)
   {
     docLinks.push(Utils.getDocLink(link));
@@ skipping 21 matching lines @@
   if (tagName === "a" && links && links.length)
     newElement.href = links.shift();
   insertMessage(newElement, value, links);
   element.appendChild(newElement);
 
   insertMessage(element, after, links);
 }
 
 window.addEventListener("load", function()
 {
-  var notification = backgroundPage.activeNotification;
+  var notification = getActiveNotification();
   if (!notification)
     return;
 
   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);
@@ skipping 35 matching lines @@
   var notificationElement = document.getElementById("notification");
   notificationElement.className = notification.type;
   notificationElement.style.display = "block";
   
   document.getElementById("close-notification").addEventListener("click", function()
   {
     notificationElement.style.display = "none";
     notification.onClicked();
   }, false);
 }, false);