Issue 6786 - Switch Safari 12+ users to content blocking API

options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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/>.
  */
 
 "use strict";
 
-var applicatonVersion = navigator.userAgent.match(/Version\/([\d.]+)/)[1];
-var majorApplicationVersion = parseInt(applicatonVersion.split(".")[0], 10);

[Sebastian Noack, 2018/07/13 18:27:53]

If you remove the dot from the regex above this step seems to be redundant.

[kzar, 2018/07/13 18:58:33]

Done.

+var majorApplicationVersion = parseInt(navigator.userAgent.match(/Version\/([\d]+)/)[1]);
 
 /**
  * Creates a wrapping function used to conveniently send a type of message.
  *
  * @param {Object} baseMessage The part of the message that's always sent
  * @param {..string} paramKeys Any message keys that have dynamic values. The
  *                             returned function will take the corresponding
  *                             values as arguments.
  * @return The generated messaging function, optionally taking any values as
  *         specified by the paramKeys and finally an optional callback.
@@ skipping 129 matching lines @@
     // running Safari and both the legacy and content blocking APIs are
     // available.
     document.getElementById("safariContentBlockerContainer").hidden = !(
       majorApplicationVersion >= 12 || (
         features.safariContentBlocker &&
         typeof safari != "undefined" &&
         "canLoad" in safari.self.tab &&
         "onbeforeload" in Element.prototype
       )
     );
+    document.getElementById("safariContentBlocker").disabled = majorApplicationVersion >= 12;
   });
   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",
@@ skipping 591 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;
   }
 });