Issue 2071 - Fixed issues when sending messages from the popup to the background page

chrome/ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 415 matching lines @@
       // let potentially some ads through, rather than blocking legit requests.
       console.error(e);
     }
   }, {urls: ["http://*/*", "https://*/*"]}, ["blocking"]);
 
 
   /* Message passing */
 
   chrome.runtime.onMessage.addListener(function(message, rawSender, sendResponse)
   {
-    var sender = {
-      page: new Page(rawSender.tab),
-      frame: {
+    var sender = {};
+
+    // Add "page" and "frame" if messsage were sent by content script.

[kzar, 2015/03/02 19:00:32]

Nit: "...if the message was sent by a..."

[Sebastian Noack, 2015/03/02 19:42:08]

Done.

+    // If sent by popup or the background page itself, there is no "tab".
+    if ("tab" in rawSender)
+    {
+      sender.page = new Page(rawSender.tab);
+      sender.frame = {
         url: new URL(rawSender.url),
         get parent()
         {
           var frames = framesOfTabs[rawSender.tab.id];
 
           if (!frames)
             return null;
 
           if ("frameId" in rawSender)
           {
             // Chrome 41+
             var frame = frames[rawSender.frameId];
             if (frame)
               return frame.parent;
           }
           else
           {
             // Chrome 28-40
             for (var frameId in frames)
             {
               if (frames[frameId].url.href == this.url.href)
                 return frames[frameId].parent;
             }
           }
 
           return frames[0];
         }
-      }
-    };
+      };
+    }
 
     return ext.onMessage._dispatch(message, sender, sendResponse).indexOf(true) != -1;
   });
 
   // We have to ensure there is at least one listener for the onConnect event.
   // Otherwise we can't connect a port later, which we need to do in order to
   // detect when the extension is reloaded, disabled or uninstalled.
   chrome.runtime.onConnect.addListener(function() {});
 
 
@@ skipping 36 matching lines @@
             callback(new Page(tab));
         }
         else
         {
           ext.pages.open(optionsUrl, callback);
         }
       });
     });
   };
 })();