Issue 3687 - Add experimental support for Safari content blockers

options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 123 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");
   initCheckbox("show_devtools_panel");
-  initCheckbox("shouldShowNotifications", {
-    key: "notifications_ignoredcategories",
-    get: function(ignoredcategories)
-    {
-      return ignoredcategories.indexOf("*") == -1;
-    }
-  });
-  initCheckbox("safariContentBlocker", {onChange: function(checkbox)
-  {
-    var restartMessage = document.getElementById("restart-safari");
-    restartMessage.hidden = true;
-
-    // When the user has chosen to use the legacy APIs but Safari has disabled
-    // them we need to show a "Please restart Safari" message.
-    if (!checkbox.checked)
-    {
-      ext.backgroundPage.sendMessage({type: "safari.contentBlockingActive"},
-      function (contentBlockingActive)
-      {
-        if (contentBlockingActive)
-          restartMessage.hidden = false;
-      });
-    }
-  }});
+  initCheckbox("shouldShowNotifications", "notifications_ignoredcategories");
+  initCheckbox("safariContentBlocker");
 
   getInfo("features", function(features)
   {
     if (!features.devToolsPanel)
       document.getElementById("showDevtoolsPanelContainer").hidden = true;
 
     // Only show the option for Safari content blocking API if the user is
     // running Safari and both the legacy and content blocking APIs are
     // available.
     document.getElementById("safariContentBlockerContainer").hidden = !(
@@ skipping 80 matching lines @@
   getSubscriptions(false, true, function(subscriptions)
   {
     clearListBox("userFiltersBox");
     clearListBox("excludedDomainsBox");
 
     for (var i = 0; i < subscriptions.length; i++)
       convertSpecialSubscription(subscriptions[i]);
   });
 }
 
-function initCheckbox(id, descriptor)
-{
+function initCheckbox(id, key)
+{
+  key = key || id;
   var checkbox = document.getElementById(id);
-  var key = descriptor && descriptor.key || id;
-  var onChange;
-  if (descriptor && descriptor.onChange)
-    onChange = descriptor.onChange.bind(undefined, checkbox);
+
   getPref(key, function(value)
   {
-    if (descriptor && descriptor.get)
-      checkbox.checked = descriptor.get(value);
-    else
-      checkbox.checked = value;
-
-    if (onChange)
-      onChange();
+    onPrefMessage(key, value);
   });
 
   checkbox.addEventListener("click", function()
   {
     togglePref(key);
   }, false);
-
-  if (onChange)
-    checkbox.addEventListener("change", onChange);
 }
 
 function loadRecommendations()
 {
   fetch("subscriptions.xml")
     .then(function(response)
     {
       return response.text();
     })
     .then(function(text)
@@ skipping 225 matching lines @@
 {
   switch (key)
   {
     case "notifications_showui":
       document.getElementById("shouldShowNotificationsContainer").hidden = !value;
       return;
     case "notifications_ignoredcategories":
       key = "shouldShowNotifications";
       value = value.indexOf("*") == -1;
       break;
-  }
-
+    case "safariContentBlocker":
+      var restartMessage = document.getElementById("restart-safari");
+      restartMessage.hidden = true;
+      // When the user has chosen to use the legacy APIs but Safari has disabled
+      // them we need to show a "Please restart Safari" message.
+      if (!value)
+      {
+        ext.backgroundPage.sendMessage({type: "safari.contentBlockingActive"},
+        function(contentBlockingActive)
+        {
+          if (contentBlockingActive)
+            restartMessage.hidden = false;
+        });
+      }
+  }
   var checkbox = document.getElementById(key);
   if (checkbox)
-  {
     checkbox.checked = value;
-    // Apparently modifying the checked attribute for a checkbox does not
-    // dispatch the change event automatically...
-    checkbox.dispatchEvent(new Event("change"));
-  }
 }
 
 function onFilterMessage(action, filter)
 {
   switch (action)
   {
     case "loaded":
       reloadFilters();
       break;
     case "added":
@@ skipping 229 matching lines @@
       onFilterMessage(message.action, message.args[0]);
       break;
     case "prefs.respond":
       onPrefMessage(message.action, message.args[0]);
       break;
     case "subscriptions.respond":
       onSubscriptionMessage(message.action, message.args[0]);
       break;
   }
 });