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

options.js

Index: options.js
diff --git a/options.js b/options.js
index f1a3c1d817061ba58b3fd78ce6c65f10c1e280e2..512ca164a5aa05259516750930fdb83167cbe152 100644
--- a/options.js
+++ b/options.js
@@ -17,6 +17,9 @@
 
 "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.

+
 /**
  * Creates a wrapping function used to conveniently send a type of message.
  *
@@ -158,10 +161,12 @@ function loadOptions()
     // 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
+      majorApplicationVersion >= 12 || (
+        features.safariContentBlocker &&
+        typeof safari != "undefined" &&
+        "canLoad" in safari.self.tab &&
+        "onbeforeload" in Element.prototype
+      )
     );
   });
   getPref("notifications_showui", function(notifications_showui)