Issue 2634 - Consider alternative URLs for element collapsing

lib/filterComposer.js

Index: lib/filterComposer.js
===================================================================
--- a/lib/filterComposer.js
+++ b/lib/filterComposer.js
@@ -95,24 +95,20 @@
     for (let url of details.urls)
     {
       let urlObj = new URL(url, details.baseURL);
+      url = stringifyURL(urlObj);
 
-      if (urlObj.protocol == "http:" || urlObj.protocol == "https:")

[Sebastian Noack, 2015/06/07 15:30:06]

Since non-HTTP(s) URLs are excluded in the content script now, this check would
be redundant. The changes below are only indentation.

+      let filter = defaultMatcher.whitelist.matchesAny(
+        url, details.type, docDomain,
+        isThirdParty(urlObj, docDomain),
+        getKey(page, frame)
+      );
+
+      if (!filter)
       {
-        url = stringifyURL(urlObj);
+        let filterText = url.replace(/^[\w\-]+:\/+(?:www\.)?/, "||");
 
-        let filter = defaultMatcher.whitelist.matchesAny(
-          url, details.type, docDomain,
-          isThirdParty(urlObj, docDomain),
-          getKey(page, frame)
-        );
-
-        if (!filter)
-        {
-          let filterText = url.replace(/^[\w\-]+:\/+(?:www\.)?/, "||");
-
-          if (filters.indexOf(filterText) == -1)
-            filters.push(filterText);
-        }
+        if (filters.indexOf(filterText) == -1)
+          filters.push(filterText);
       }
     }