Align whitelisting behavior in Chrome with Firefox

background.js

 importAll("filterClasses", this);
 importAll("subscriptionClasses", this);
 importAll("filterStorage", this);
 importAll("elemHide", this);
 importAll("filterListener", this);
 importAll("filterNotifier", this);
 importAll("matcher", this);
 importAll("synchronizer", this);
 
 // Some types cannot be distinguished
@@ skipping 33 matching lines @@
     delete localStorage.specialCaseYouTube;
   if ("experimental" in localStorage)
     delete localStorage.experimental;
 }
 
 // Upgrade options before we do anything else.
 setDefaultOptions(); 
 
 /**
  * Checks whether a page is whitelisted.
- * @param url {String}
+ * @param {String} url
+ * @param {String} [type] content type to be checked, default is "DOCUMENT"
  * @return {Filter} filter that matched the URL or null if not whitelisted
  */
 function isWhitelisted(url, type)

[Felix Dahlke, 2012/09/18 13:23:14]

The new type parameter isn't documented above.

 {
   // Ignore fragment identifier
   var index = url.indexOf("#");
   if (index >= 0)
     url = url.substring(0, index);
 
   var result = defaultMatcher.matchesAny(url, type || "DOCUMENT", extractHostFromURL(url), false);
   return (result instanceof WhitelistFilter ? result : null);
 }
 
@@ skipping 288 matching lines @@
     case "get-settings":
       var hostDomain = null;
       var selectors = null;
 
       // HACK: We don't know which frame sent us the message, try to find it
       // in webRequest's frame data.
       var tabId = -1;
       var frameId = -1;
       if (sender.tab)
       {
-        var tabId = sender.tab.id;

[Felix Dahlke, 2012/09/18 13:23:14]

You're redeclaring tabId here.

+        tabId = sender.tab.id;
         if (tabId in frames)

[Felix Dahlke, 2012/09/18 13:23:14]

I don't think this statement is necessary here. The "f in frames[tabId]" below
should handle frames[tabId] being undefined. Still a bit of a code style
question though, it's more explicit this way.

[Wladimir Palant, 2012/09/18 15:12:11]

Yes, I don't usually rely on this and generally avoid dealing with undefined
values - Firefox warns you about that if you switch on warnings so I just don't.

         {
           for (var f in frames[tabId])
           {
             if (getFrameUrl(tabId, f) == request.frameUrl)
             {
               frameId = f;
               break;
             }
           }
         }
@@ skipping 108 matching lines @@
       refreshIconAndContextMenu(windows[i].tabs[j]);
 });
 
 // Update icon if a tab changes location
 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
 {
   chrome.tabs.sendRequest(tabId, {reqtype: "clickhide-deactivate"})
   if(changeInfo.status == "loading")
     refreshIconAndContextMenu(tab);
 });