Moved initAntiAdblockNotification function from ui.js to its own file

lib/ui.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
  * 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/>.
  */
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 let {Utils} = require("utils");
 let {Prefs} = require("prefs");
 let {Policy} = require("contentPolicy");
 let {FilterListener} = require("filterListener");
 let {FilterStorage} = require("filterStorage");
 let {FilterNotifier} = require("filterNotifier");
 let {RequestNotifier} = require("requestNotifier");
-let {Filter, ActiveFilter} = require("filterClasses");
+let {Filter} = require("filterClasses");
 let {Subscription, SpecialSubscription, DownloadableSubscription} = require("subscriptionClasses");
 let {Synchronizer} = require("synchronizer");
 let {KeySelector} = require("keySelector");
 let {Notification} = require("notification");
+let {initAntiAdblockNotification} = require("antiadblockInit");
 
 let CustomizableUI;
 try
 {
   ({CustomizableUI}) = Cu.import("resource:///modules/CustomizableUI.jsm", null);
 }
 catch (e)
 {
   // No built-in CustomizableUI API, use our own implementation.
   ({CustomizableUI}) = require("customizableUI");
@@ skipping 348 matching lines @@
 
       if (this.overlay.all.length)
         this.overlay.all[0].appendChild(menuSource);
       if ("abp-toolbarbutton" in this.overlay)
         this.overlay["abp-toolbarbutton"].appendChild(fixId(menuSource.cloneNode(true), "abp-toolbar"));
       if ("abp-menuitem" in this.overlay)
         this.overlay["abp-menuitem"].appendChild(fixId(menuSource.cloneNode(true), "abp-menuitem"));
     }
   },
 
-  _initAntiAdblockNotification: function()
-  {
-    let notification = {
-      id: "antiadblock",
-      type: "question",
-      title: Utils.getString("notification_antiadblock_title"),
-      message: Utils.getString("notification_antiadblock_message"),
-      urlFilters: []
-    };
-
-    function notificationListener(approved)
-    {
-      let subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
-      if (subscription.url in FilterStorage.knownSubscriptions)
-        subscription.disabled = !approved;
-    }
-
-    function addAntiAdblockNotification(subscription)
-    {
-      let urlFilters = [];
-      for each (let filter in subscription.filters)
-        if (filter instanceof ActiveFilter)
-          for (let 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);
-    }
-
-    let 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();
-    });
-
-    var documentCreationObserver = {
-      observe: function(subject, topic, data) 
-      {
-        if (!(subject instanceof Ci.nsIDOMWindow))
-          return;
-        
-        this._showNextNotification(subject.location.href);
-      }.bind(this)
-    };
-    Services.obs.addObserver(documentCreationObserver, "content-document-global-created", false);
-    onShutdown.add(function()
-    {
-      Services.obs.removeObserver(documentCreationObserver, "content-document-global-created", false);
-    });
-  },
-
   /**
    * Gets called once the initialization is finished and Adblock Plus elements
    * can be added to the UI.
    */
   initDone: function()
   {
     let {WindowObserver} = require("windowObserver");
     new WindowObserver(this);
 
     // Add toolbar icon
@@ skipping 37 matching lines @@
           this.updateStatusbarIcon(window);
       }
     }.bind(this));
     FilterNotifier.addListener(function(action)
     {
       if (/^(filter|subscription)\.(added|removed|disabled|updated)$/.test(action) || action == "load")
         this.updateState();
     }.bind(this));
 
     notificationTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-    notificationTimer.initWithCallback(this._showNextNotification.bind(this),
+    notificationTimer.initWithCallback(this.showNextNotification.bind(this),
                                        3 * 60 * 1000, Ci.nsITimer.TYPE_ONE_SHOT);
     onShutdown.add(function() notificationTimer.cancel());
   },
 
   /**
    * Will be set to true after the check whether first-run actions should run
    * has been performed.
    * @type Boolean
    */
   firstRunDone: false,
@@ skipping 55 matching lines @@
       this.updateIconState(window, window.document.getElementById("abp-toolbarbutton"));
     }.bind(this));
     addBrowserClickListener(window, this.onBrowserClick.bind(this, window));
 
     window.document.getElementById("abp-notification-close").addEventListener("command", function(event)
     {
       window.document.getElementById("abp-notification").hidePopup();
     }, false);
 
     // Add "anti-adblock messages" notification
-    this._initAntiAdblockNotification();
+    initAntiAdblockNotification();
+
+    let documentCreationObserver = {
+      observe: function(subject, topic, data)
+      {
+        if (!(subject instanceof Ci.nsIDOMWindow))
+          return;
+
+        this.showNextNotification(subject.location.href);
+      }.bind(UI)
+    };
+    Services.obs.addObserver(documentCreationObserver, "content-document-global-created", false);
+    onShutdown.add(function()
+    {
+      Services.obs.removeObserver(documentCreationObserver, "content-document-global-created", false);
+    });
 
     // First-run actions?
     if (!this.firstRunDone)
     {
       this.firstRunDone = true;
 
       let {addonVersion} = require("info");
       let prevVersion = Prefs.currentVersion;
       if (prevVersion != addonVersion)
       {
@@ skipping 1231 matching lines @@
     Prefs.hideContributeButton = true;
 
     for each (let id in ["abp-status-contributebutton", "abp-toolbar-contributebutton", "abp-menuitem-contributebutton"])
     {
       let button = window.document.getElementById(id);
       if (button)
         button.hidden = true;
     }
   },
 
-  _showNextNotification: function(url)
+  showNextNotification: function(url)
   {
     let window = this.currentWindow;
     if (!window)
       return;
 
     let button = window.document.getElementById("abp-toolbarbutton")
       || window.document.getElementById("abp-status");
     if (!button)
       return;
 
@@ skipping 99 matching lines @@
   ["abp-command-contribute", "command", UI.openContributePage.bind(UI)],
   ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)]
 ];
 
 onShutdown.add(function()
 {
   for (let window in UI.applicationWindows)
     if (UI.isBottombarOpen(window))
       UI.toggleBottombar(window);
 });