Ported over anti-adblock message notification

background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 23 matching lines @@
   this.isFrameWhitelisted = isFrameWhitelisted;
   this.processKeyException = processKeyException;
 }
 var FilterStorage = require("filterStorage").FilterStorage;
 var ElemHide = require("elemHide").ElemHide;
 var defaultMatcher = require("matcher").defaultMatcher;
 var Prefs = require("prefs").Prefs;
 var Synchronizer = require("synchronizer").Synchronizer;
 var Utils = require("utils").Utils;
 var Notification = require("notification").Notification;
+var initAntiAdblockNotification = require("antiadblockInit").initAntiAdblockNotification;
 
 // Some types cannot be distinguished
 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
 RegExpFilter.typeMap.MEDIA = RegExpFilter.typeMap.FONT = RegExpFilter.typeMap.OTHER;
 
 var isFirstRun = false;
 var seenDataCorruption = false;
 require("filterNotifier").FilterNotifier.addListener(function(action)
 {
   if (action == "load")
@@ skipping 191 matching lines @@
 
           notifyUser();
       }
     }, false);
     request.send(null);
   }
   else
     notifyUser();
 }
 
-function initAntiAdblockNotification()

[Felix Dahlke, 2014/03/18 14:21:41]

This is pretty much the same code we have in Firefox, I think we should reuse
it.

[Thomas Greiner, 2014/03/19 13:45:40]

Done.

-{
-  var notification = {
-    id: "antiadblock",
-    type: "question",
-    title: ext.i18n.getMessage("global_notification_antiadblock_title"),
-    message: ext.i18n.getMessage("global_notification_antiadblock_message"),
-    urlFilters: []
-  };
-
-  function notificationListener(approved)
-  {
-    var subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
-    if (subscription.url in FilterStorage.knownSubscriptions)
-      subscription.disabled = !approved;
-  }
-
-  function addAntiAdblockNotification(subscription)
-  {
-    var urlFilters = [];
-    subscription.filters.forEach(function(filter)
-    {
-      if (filter instanceof ActiveFilter)
-        for (var domain in filter.domains)
-          if (domain && urlFilters.indexOf(domain) == -1)
-            urlFilters.push(domain);
-    });
-    notification.urlFilters = urlFilters;
-    Notification.addNotification(notification);
-    Notification.addQuestionListener(notification.id, notificationListener);
-  }
-
-  function removeAntiAdblockNotification()
-  {
-    Notification.removeNotification(notification);
-    Notification.removeQuestionListener(notification.id, notificationListener);
-  }
-
-  var subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
-  if (subscription.lastDownload && subscription.disabled)
-    addAntiAdblockNotification(subscription);
-
-  FilterNotifier.addListener(function(action, value, newItem, oldItem)
-  {
-    if (!/^subscription\.(updated|removed|disabled)$/.test(action) || value.url != Prefs.subscriptions_antiadblockurl)
-      return;
-
-    if (action == "subscription.updated")
-      addAntiAdblockNotification(value);
-    else if (action == "subscription.removed" || (action == "subscription.disabled" && !value.disabled))
-      removeAntiAdblockNotification();
-  });
-}
-
 function setContextMenu()
 {
   if (Prefs.shouldShowBlockElementMenu)
   {
     // Register context menu item
     ext.contextMenus.addMenuItem(ext.i18n.getMessage("block_element"), ["image", "video", "audio"], function(srcUrl, tab)
     {
       if (srcUrl)
         tab.sendMessage({type: "clickhide-new-filter", filter: srcUrl});
     });
@@ skipping 36 matching lines @@
       win.openTab(optionsUrl, callback && function(tab)
       {
         tab.onCompleted.addListener(callback);
       });
     });
   });
 }
 
 function prepareNotificationIconAndPopup()
 {
+  var animateIcon = (activeNotification.type !== "question");
   activeNotification.onClicked = function()
   {
-    iconAnimation.stop();
+    if (animateIcon)
+      iconAnimation.stop();
     activeNotification = null;
   };
-  iconAnimation.update(activeNotification.type);
+  if (animateIcon)
+    iconAnimation.update(activeNotification.type);
 }
 
 function openNotificationLinks() 
 {
   if (activeNotification.links)
   {
     activeNotification.links.forEach(function(link)
     {
       ext.windows.getLastFocused(function(win)
       {
@@ skipping 197 matching lines @@
   tab.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(tab);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);