Issue 154 - Make the devtools panel generate domain specific filters when $genericblock is active

devtools-panel.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
-function generateFilter(request)
+function generateFilter(request, domainSpecific)
 {
   var filter = request.url.replace(/^[\w\-]+:\/+(?:www\.)?/, "||");
+  var options = [];
 
   if (request.type == "POPUP")
   {
-    filter += "$popup";
+    options.push("popup");
 
     if (request.url == "about:blank")
-      filter += ",domain=" + request.docDomain;
+      domainSpecific = true;

[kzar, 2016/02/03 10:27:17]

Nit: `domainSpecific = domainSpecific || request.url == "about:blank";`? (Or
just check for `if (domainSpecific || request.url == "about:blank")` later?)

[Sebastian Noack, 2016/02/03 10:35:27]

No, that's only if it's a popup.

[kzar, 2016/02/03 10:40:27]

Acknowledged. Though the first suggestion still stands. Doesn't matter too much
either way anyway.

   }
 
+  if (domainSpecific)
+    options.push("domain=" + request.docDomain);
+
+  if (options.length > 0)
+    filter += "$" + options.join(",");
+
   return filter;
 }
 
 function createActionButton(action, label, filter)
 {
   var button = document.createElement("span");
 
   button.textContent = label;
   button.classList.add("action");
 
@@ skipping 47 matching lines @@
     {
       if (filter.userDefined)
         originElement.textContent = "user-defined";
       else
         originElement.textContent = "unnamed subscription";
 
       originElement.classList.add("unnamed");
     }
 
     if (!filter.whitelisted && request.type != "ELEMHIDE")
-      actionWrapper.appendChild(createActionButton("add", "Add exception", "@@" + generateFilter(request)));
+      actionWrapper.appendChild(createActionButton(
+        "add", "Add exception", "@@" + generateFilter(request, false)
+      ));
 
     if (filter.userDefined)
-      actionWrapper.appendChild(createActionButton("remove", "Remove rule", filter.text));
+      actionWrapper.appendChild(createActionButton(
+        "remove", "Remove rule", filter.text
+      ));
   }
   else
-    actionWrapper.appendChild(createActionButton("add", "Block item", generateFilter(request)));
+    actionWrapper.appendChild(createActionButton(
+      "add", "Block item", generateFilter(request, request.specificOnly)
+    ));
 
   return row;
 }
 
 document.addEventListener("DOMContentLoaded", function()
 {
   var container = document.getElementById("items");
   var table = container.querySelector("tbody");
   var template = document.querySelector("template").content.firstElementChild;
 
@@ skipping 34 matching lines @@
         container.classList.add("has-changes");
         break;
 
       case "reset":
         table.innerHTML = "";
         container.classList.remove("has-changes");
         break;
     }
   });
 }, false);