Issue 4577 - Remove Safari support

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 129 matching lines @@
   $("#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", "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 = !(
-      features.safariContentBlocker &&
-      typeof safari != "undefined" &&
-      "canLoad" in safari.self.tab &&
-      "onbeforeload" in Element.prototype
-    );
   });
   getPref("notifications_showui", function(notifications_showui)
   {
     if (!notifications_showui)
       document.getElementById("shouldShowNotificationsContainer").hidden = true;
   });
 
   // Register listeners in the background message responder
   ext.backgroundPage.sendMessage({
     type: "app.listen",
     filter: ["addSubscription", "focusSection"]
   });
   ext.backgroundPage.sendMessage(
   {
     type: "filters.listen",
     filter: ["added", "loaded", "removed"]
   });
   ext.backgroundPage.sendMessage(
   {
     type: "prefs.listen",
     filter: ["notifications_ignoredcategories", "notifications_showui",
-             "safariContentBlocker", "show_devtools_panel",
-             "shouldShowBlockElementMenu"]
+             "show_devtools_panel", "shouldShowBlockElementMenu"]
   });
   ext.backgroundPage.sendMessage(
   {
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
              "title", "downloadStatus", "downloading"]
   });
 
   // Load recommended subscriptions
   loadRecommendations();
@@ skipping 301 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;
 }
 
 function onFilterMessage(action, filter)
 {
   switch (action)
   {
@@ skipping 233 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;
   }
 });