Issue 2195 - Added notification opt-out (Platform)

options.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
@@ skipping 21 matching lines @@
 with(require("filterValidation"))
 {
   this.parseFilter = parseFilter;
   this.parseFilters = parseFilters;
 }
 var FilterStorage = require("filterStorage").FilterStorage;
 var FilterNotifier = require("filterNotifier").FilterNotifier;
 var Prefs = require("prefs").Prefs;
 var Synchronizer = require("synchronizer").Synchronizer;
 var Utils = require("utils").Utils;
+var NotificationStorage = require("notification").Notification;
 
 // Loads options from localStorage and sets UI elements accordingly
 function loadOptions()
 {
   // Set page title to i18n version of "Adblock Plus Options"
   document.title = i18n.getMessage("options");
 
   // Set links
   $("#acceptableAdsLink").attr("href", Prefs.subscriptions_exceptionsurl);
   $("#acceptableAdsDocs").attr("href", Utils.getDocLink("acceptable_ads"));
@@ skipping 17 matching lines @@
 
   // Display jQuery UI elements
   $("#tabs").tabs();
   $("button").button();
   $(".refreshButton").button("option", "icons", {primary: "ui-icon-refresh"});
   $(".addButton").button("option", "icons", {primary: "ui-icon-plus"});
   $(".removeButton").button("option", "icons", {primary: "ui-icon-minus"});
 
   // Popuplate option checkboxes
   initCheckbox("shouldShowBlockElementMenu");
+  if (Prefs.notifications_showui)
+  {
+    initCheckbox("shouldShowNotifications", {
+      get: function()
+      {
+        return Prefs.notifications_ignoredcategories.indexOf("*") == -1;
+      },
+      toggle: function()
+      {
+        NotificationStorage.toggleIgnoreCategory("*");
+        return Prefs.notifications_ignoredcategories.indexOf("*") == -1;

[Sebastian Noack, 2015/06/25 13:55:04]

How about |this.get()| to avoid code duplication?

[Thomas Greiner, 2015/06/25 16:48:44]

Done.

+      }
+    });
+  }
+  else
+    document.getElementById("shouldShowNotificationsContainer").hidden = true;
 
   ext.onMessage.addListener(onMessage);
 
   // Load recommended subscriptions
   loadRecommendations();
 
   // Show user's filters
   reloadFilters();
 }
 $(loadOptions);
@@ skipping 35 matching lines @@
   populateList("userFiltersBox", userFilters.filters);
   populateList("excludedDomainsBox", userFilters.exceptions);
 }
 
 // Cleans up when the options window is closed
 function unloadOptions()
 {
   FilterNotifier.removeListener(onFilterChange);
 }
 
-function initCheckbox(id)
+function initCheckbox(id, descriptor)
 {
   var checkbox = document.getElementById(id);
-  checkbox.checked = Prefs[id];
+  if (descriptor && descriptor.get)
+    checkbox.checked = descriptor.get();
+  else
+    checkbox.checked = Prefs[id];
+
   checkbox.addEventListener("click", function()
   {
+    if (descriptor && descriptor.toggle)
+      checkbox.checked = descriptor.toggle();
+
     Prefs[id] = checkbox.checked;
   }, false);
 }
 
 var delayedSubscriptionSelection = null;
 
 function loadRecommendations()
 {
   var request = new XMLHttpRequest();
   request.open("GET", "subscriptions.xml");
@@ skipping 490 matching lines @@
       links[i].href = arguments[i + 1];
       links[i].setAttribute("target", "_blank");
     }
     else if (typeof arguments[i + 1] == "function")
     {
       links[i].href = "javascript:void(0);";
       links[i].addEventListener("click", arguments[i + 1], false);
     }
   }
 }