Issue 3478 - Hide genericblock and generichide from the composer

chrome/content/ui/composer.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 120 matching lines @@
     E("domainRestriction").value = docDomain;
 
   E("thirdParty").hidden = !thirdParty;
   E("firstParty").hidden = thirdParty;
 
   let typeGroup = E("typeGroup");
   let defaultTypes = RegExpFilter.prototype.contentType & ~RegExpFilter.typeMap.DOCUMENT;
   let isDefaultType = (RegExpFilter.typeMap[item.type] & defaultTypes) != 0;
   for (let type of types)
   {
-    if (type == "ELEMHIDE")
+    if (type == "ELEMHIDE" || type == "GENERICBLOCK" || type == "GENERICHIDE")
       continue;
 
     let typeNode = document.createElement("checkbox");
     typeNode.setAttribute("value", type.toLowerCase().replace(/\_/g, "-"));
     typeNode.setAttribute("label", Utils.getString("type_label_" + type.toLowerCase()));
 
     let typeMask = RegExpFilter.typeMap[type];
     typeNode._defaultType = (typeMask & defaultTypes) != 0;
     if ((isDefaultType && typeNode._defaultType) || (!isDefaultType && item.type == type))
       typeNode.setAttribute("checked", "true");
@@ skipping 65 matching lines @@
     disableElement(collapse, type == "whitelist", "value", "");
     if (collapse.value != "")
       options.push([collapse._lastChange, collapse.value]);
 
     let enabledTypes = [];
     let disabledTypes = [];
     let forceEnabledTypes = [];
     for (let typeNode = E("typeGroup").firstChild; typeNode; typeNode = typeNode.nextSibling)
     {
       let value = typeNode.getAttribute("value");
-      if (value == "document" || value == "genericblock" || value == "generichide")

[Thomas Greiner, 2016/01/06 15:44:51]

What about "elemhide"? Similar to these options "elemhide" also only makes sense
for exception rules.

[Sebastian Noack, 2016/01/06 15:49:33]

Interestingly, "ELEMHIDE" is skipped above. So no checkbox is added. I wonder
why we treat elemhide differently from document here?

[Thomas Greiner, 2016/01/06 16:07:02]

I assume that's because the composer only creates rules for blocking filters.
While ELEMHIDE is used in the context of a blocking filter it only applies to
element hiding filters (which you'd need Element Hiding Helper to create).

So it seems that if we want to be consistent with the existing logic, we'd have
to treat GENERICHIDE the same way as ELEMHIDE and only consider GENERICBLOCK at
this part of the code.

[Sebastian Noack, 2016/01/06 16:15:10]

I wonder whether we should expose generichide and genericblock here at all. I
agree that it makes no sense to have generichide exposed, but not  elemhide
which is a superset of it. But having only genericblock exposed seems
inconsistent, besides the genricblock/generichide options being experimental
anyway. Here is a new patch set.

+      if (value == "document")
         disableElement(typeNode, type != "whitelist", "checked", false);
 
       if (!typeNode._defaultType)
       {
         if (typeNode.getAttribute("checked") == "true")
           forceEnabledTypes.push([typeNode._lastChange || 0, value]);
       }
       else if (typeNode.getAttribute("checked") == "true")
         enabledTypes.push([typeNode._lastChange || 0, value]);
       else
@@ skipping 155 matching lines @@
  * Selects or unselects all type checkboxes except those
  * that are disabled.
  */
 function selectAllTypes(/**Boolean*/ select)
 {
   for (let typeNode = E("typeGroup").firstChild; typeNode; typeNode = typeNode.nextSibling)
     if (typeNode.getAttribute("disabled") != "true")
       typeNode.checked = select;
   updateFilter();
 }