Issue 3687 - Add experimental support for Safari content blockers

safari/ext/content.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 23 matching lines @@
   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.

+  {
+  }
 
   var isTopLevel;
   var isPrerendered;
   var documentId;
   function notifyFrameLoading()
   {
     isTopLevel = window == window.top;
     isPrerendered = document.visibilityState == "prerender";
     documentId = Math.random().toString().substr(2);
 
@@ skipping 92 matching lines @@
         // been prevented from loading by having their "beforeload" event
         // cancelled. That is a "load" event for blocked frames, and an "error"
         // event for other blocked elements. We need to dispatch those events
         // manually here to avoid breaking element collapsing and pages that
         // rely on those events.
         setTimeout(function()
         {
           var evt = document.createEvent("Event");
           evt.initEvent(eventName);
           event.target.dispatchEvent(evt);
-        }, 0);

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

Nit: 0 is the default for the second argument to setTimeout(). So we usually
omit it.

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

Done.

+        });
       }
     }, true);
   }
 
 
   /* Context menus */
 
   document.addEventListener("contextmenu", function(event)
   {
     var element = event.srcElement;
@@ skipping 54 matching lines @@
   });
 
 
   /* Detecting extension reload/disable/uninstall (not supported on Safari) */
 
   ext.onExtensionUnloaded = {
     addListener: function() {},
     removeListener: function() {}
   };
 })();