Issue 1592 - Fixed frame collapsing on Safari

safari/ext/content.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 86 matching lines @@
         category: "webRequest",
         url: url,
         type: type,
         pageId: documentInfo.pageId,
         frameId: documentInfo.frameId
       }
     ))
     {
       event.preventDefault();
 
-      // Safari doesn't dispatch all the expected events for elements that
-      // have been prevented from loading by having their "beforeload" event
-      // cancelled. "error" events are never dispatched, and since Safari 8
-      // "load" events are also not dispatched, when blocking frames.
-      // We need to dispatch those events manually here to avoid breaking
-      // element collapsing and pages that rely on those events.
-      if (type != "sub_frame" || parseInt(navigator.userAgent.match(/\bVersion\/(\d+)/)[1], 10) >= 8)
-      {
-        setTimeout(function()
-        {
-          var evt = document.createEvent("Event");
-          evt.initEvent(eventName);
-          event.target.dispatchEvent(evt);
-        }, 0);
-      }
+      // Safari doesn't dispatch the expected events for elements that have 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);
     }
   }, true);
 
 
   /* Context menus */
 
   document.addEventListener("contextmenu", function(event)
   {
     var element = event.srcElement;
     safari.self.tab.setContextMenuEventUserInfo(event, {
@@ skipping 294 matching lines @@
             messageProxy.handleResponse(event.message);
             break;
           case "proxyCallback":
             backgroundPageProxy.handleCallback(event.message);
             break;
         }
       }
     }
   });
 })();