Deal with preloadded pages in Safari 7.0

safari/ext/common.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 51 matching lines @@
   MessageEventTarget = function(target)
   {
     WrappedEventTarget.call(this, target, "message", false);
   };
   MessageEventTarget.prototype = {
     __proto__: WrappedEventTarget.prototype,
     _wrapListener: function(listener)
     {
       return function(event)
       {
-        if (event.name == "request")
+        if (event.name == "request" && !this._ignoreIf(event))
           listener(event.message.payload, this._getSenderDetails(event), function(message)
           {
             this._getResponseDispatcher(event).dispatchMessage("response",
             {
               requestId: event.message.requestId,
               payload: message
             });
           }.bind(this));
       }.bind(this);
     }
   };
 
 
   /* Message passing */
 
   var requestCounter = 0;
 
   _sendMessage = function(message, responseCallback, messageDispatcher, responseEventTarget, extra)
   {
     var requestId = ++requestCounter;
 
     if (responseCallback)
     {
       var responseListener = function(event)
       {
         if (event.name == "response" && event.message.requestId == requestId)
         {
           responseEventTarget.removeEventListener("message", responseListener, false);
-          responseCallback(event.message.payload);
+          responseCallback(event.message);
         }
       };
       responseEventTarget.addEventListener("message", responseListener, false);
     }
 
     var rawMessage = {requestId: requestId, payload: message};
     for (var k in extra)
       rawMessage[k] = extra[k];
     messageDispatcher.dispatchMessage("request", rawMessage);
   };
@@ skipping 100 matching lines @@
   /* API */
 
   ext = {
     getURL: function(path)
     {
       return safari.extension.baseURI + path;
     },
     i18n: new I18n()
   };
 })();