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 227 matching lines @@
     clearListBox("userFiltersBox");
     clearListBox("excludedDomainsBox");
 
     for (var i = 0; i < subscriptions.length; i++)
       convertSpecialSubscription(subscriptions[i]);
   });
 }
 
 function initCheckbox(id, key)
 {
   key = key || id;

[Sebastian Noack, 2016/05/18 11:16:32]

Note that when we retrieve the checkbox later in onPrefMessage() we assume the
key and id to be the same, which will fail for
"notifications_ignoredcategories". So perhaps remove that logic here as well and
just rename the ID in the HTML?

[kzar, 2016/05/18 11:32:07]

Actually onPrefMessage already handles that, changing the key to
shouldShowNotifications.

[Sebastian Noack, 2016/05/18 11:36:45]

Hm, seems that logic could be simplified altogether then, by just adapting the
HTML ID. But up to you, as it's not directly related to your changes.

   var checkbox = document.getElementById(id);
 
   getPref(key, function(value)
   {
     onPrefMessage(key, value);
   });
 
   checkbox.addEventListener("click", function()
   {
     togglePref(key);
@@ skipping 244 matching lines @@
       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)

[Sebastian Noack, 2016/05/18 11:16:32]

Nit: Redundant space before arguments list.

[kzar, 2016/05/18 11:32:07]

Done.

+        function(contentBlockingActive)
         {
           if (contentBlockingActive)
             restartMessage.hidden = false;
         });
       }
   }
   var checkbox = document.getElementById(key);
   if (checkbox)
     checkbox.checked = value;
 }
@@ skipping 238 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;
   }
 });