Issue 1282 - Don't generate filters conflicting with existing exception rules

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 342 matching lines @@
 {
   if (activeNotification && activeNotification.id === notification.id)
     return;
 
   activeNotification = notification;
   if (activeNotification.type === "critical" || activeNotification.type === "question")
   {
     var texts = NotificationStorage.getLocalizedTexts(notification);
     var title = texts.title || "";
     var message = texts.message ? texts.message.replace(/<\/?(a|strong)>/g, "") : "";
-    var iconUrl = ext.getURL("icons/abp-128.png");
+    var iconUrl = ext.getURL("icons/detailed/abp-128.png");
     var hasLinks = activeNotification.links && activeNotification.links.length > 0;
 
     if (canUseChromeNotifications)
     {
       var opts = {
         type: "basic",
         title: title,
         message: message,
         buttons: [],
         priority: 2 // We use the highest priority to prevent the notification from closing automatically
@@ skipping 172 matching lines @@
       });
       break;
     case "add-sitekey":
       processKey(msg.token, sender.page, sender.frame);
       break;
     case "report-html-page":
       htmlPages.set(sender.page, null);
       refreshIconAndContextMenu(sender.page);
       break;
     case "compose-filters":
-      sendResponse(composeFilters(
-        msg.tagName, msg.id, msg.src, msg.style,
-        msg.classes, msg.urls, msg.mediatype,
-        msg.baseURL, sender.page, sender.frame

[Wladimir Palant, 2015/03/02 20:14:19]

Ten positional parameters in a function is certainly a reason to worry. Normally
you would turn the parameters into a dictionary but in this particular case -
maybe pass in msg and sender directly?

[Sebastian Noack, 2015/03/03 14:29:00]

How about reducing the number of arguments by grouping the element's attributes
into an object?

[Wladimir Palant, 2015/03/03 14:40:31]

That's eight parameters now - still way too many to be passed by position for my
taste.

[Sebastian Noack, 2015/03/03 14:59:28]

Fair enough.

-      ));
+      sendResponse(composeFilters({
+        tagName: msg.tagName,
+        id: msg.id,
+        src: msg.src,
+        style: msg.style,
+        classes: msg.classes,
+        urls: msg.urls,
+        type: msg.mediatype,
+        baseURL: msg.baseURL,
+        page: sender.page,
+        frame: sender.frame
+      }));
       break;
     case "forward":
       if (sender.page)
       {
         if (msg.expectsResponse)
         {
           sender.page.sendMessage(msg.payload, sendResponse);
           return true;
         }
 
         sender.page.sendMessage(msg.payload);
       }
       break;
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
 });
 
 setTimeout(function()
 {
   var notificationToShow = NotificationStorage.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);