Issue 3687 - Add experimental support for Safari content blockers

safari/include.youtube.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
  * 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/>.
  */
 
 (function() {
   if (document.domain != "www.youtube.com")
     return;
 
+  var usingContentBlockerAPI = true;
+  try
+  {
+    if (safari.self.tab.canLoad(beforeLoadEvent,
+                                {category: "request",
+                                 payload: {type: "prefs.get",
+                                           key: "safariContentBlocker"}}) != true)
+      usingContentBlockerAPI = false;
+  }
+  catch (e)
+  { }

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

Nit: The closing brace should go on a new line as well.

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

Done.

+
+  if (usingContentBlockerAPI)
+    return;
+
   if (ext.backgroundPage.sendMessageSync({type: "filters.isPageWhitelisted"}))
     return;
 
   var badArgumentsRegex = /^((.*_)?(ad|ads|afv|adsense)(_.*)?|(ad3|st)_module|prerolls|interstitial|infringe|iv_cta_url)$/;
 
   function rewriteFlashvars(flashvars)
   {
     var pairs = flashvars.split("&");
     for (var i = 0; i < pairs.length; i++)
       if (badArgumentsRegex.test(pairs[i].split("=")[0]))
         pairs.splice(i--, 1);
     return pairs.join("&");
   }
 
-  function patchPlayer(player) 
+  function patchPlayer(player)
   {
     var newPlayer = player.cloneNode(true);
     var flashvarsChanged = false;
 
     var flashvars = newPlayer.getAttribute("flashvars");
     if (flashvars)
     {
       var newFlashvars = rewriteFlashvars(flashvars);
       if (flashvars != newFlashvars)
       {
@@ skipping 109 matching lines @@
               config.args = rawConfig.args;
             }
           }
         });
 
         ytplayer.config = rawYtplayer.config;
       }
     });
   }, badArgumentsRegex);
 })();