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 48 matching lines @@
   {
     var url = resolveURL(event.url);
 
     // we don't block non-HTTP requests anyway, so we can bail out
     // without asking the background page. This is even necessary
     // because passing large data (like a photo encoded as data: URL)
     // to the background page, freezes Safari.
     if (!/^https?:/.test(url))
       return;
 
-    var type;
+    var type = "other";
+    var eventName = "error";
+
     switch(event.target.localName)
     {
       case "frame":
       case "iframe":
         type = "sub_frame";
+        eventName = "load";
         break;
       case "img":
         type = "image";
         break;
       case "object":
       case "embed":
         type = "object";
         break;
       case "script":
         type = "script";
         break;
       case "link":
         if (/\bstylesheet\b/i.test(event.target.rel))
-        {
           type = "stylesheet";
-          break;
-        }
-      default:
-        type = "other";
+        break;
     }
 
     if (!safari.self.tab.canLoad(
       event, {
         category: "webRequest",
         url: url,
         type: type,
         pageId: documentInfo.pageId,
         frameId: documentInfo.frameId
       }
     ))
     {
       event.preventDefault();
 
-      // Safari doesn't dispatch an "error" event when preventing an element
-      // from loading by cancelling the "beforeload" event. So we have to
-      // dispatch it manually. Otherwise element collapsing wouldn't work.
-      if (type != "sub_frame")
+      // 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()
       {
-        setTimeout(function()
-        {
-          var evt = document.createEvent("Event");
-          evt.initEvent("error");
-          event.target.dispatchEvent(evt);
-        }, 0);
-      }
+        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;
         }
       }
     }
   });
 })();