Issue 5169 - Add whitelisted tab to the new options page

new-options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 79 matching lines @@
     {
       // Make sure that Acceptable Ads is always last, since it cannot be
       // disabled, but only be removed. That way it's grouped together with
       // the "Own filter list" which cannot be disabled either at the bottom
       // of the filter lists in the Advanced tab.
       if (a.url == acceptableAdsUrl)
         return 1;
       if (b.url == acceptableAdsUrl)
         return -1;
 
-      // Make sure that duplicated whitelist entries are always being moved to

[Thomas Greiner, 2017/06/16 10:35:45]

Detail: This is not about handling duplicated entries. This is about making sure
that newly added entries always appear on top.

[saroyanm, 2017/06/16 11:13:54]

That's a very good question, I didn't know about that behavior.

I've created an issue for the specs to clarify this ->
https://bitbucket.org/adblockplus/spec/issues/35/how-lists-should-be-sorted

I think it's a critical issue as it blocks current review (@wspee).

[saroyanm, 2017/06/16 13:05:11]

The mentioned behavior was confirmed, so I'll update this with the next patch.

[saroyanm, 2017/06/16 16:44:07]

Done.

-      // the top of the list
+      // Make sure that newly added entries always appear on top in descending
+      // chronological order
       let aTimestamp = a[timestampUI] || 0;
       let bTimestamp = b[timestampUI] || 0;
       if (aTimestamp || bTimestamp)
         return bTimestamp - aTimestamp;
 
       let aTitle = this._getItemTitle(a, 0).toLowerCase();
       let bTitle = this._getItemTitle(b, 0).toLowerCase();
       return aTitle.localeCompare(bTitle);
     });
   };
@@ skipping 79 matching lines @@
       }
 
       element.parentElement.removeChild(element);
       if (this.items.length == 0)
         this._setEmpty(table, detail.emptyText);
     }
   };
 
   Collection.prototype.updateItem = function(item)
   {
-    var oldIndex = this.items.indexOf(item);
+    let oldIndex = this.items.indexOf(item);
     this._sortItems();
     let access = (item.url || item.text).replace(/'/g, "\\'");
     for (let i = 0; i < this.details.length; i++)
     {
       let table = E(this.details[i].id);
       let element = table.querySelector("[data-access='" + access + "']");
       if (!element)
         continue;
 
       let title = this._getItemTitle(item, i);
@@ skipping 44 matching lines @@
         if (item.homepage)
           websiteElement.setAttribute("href", item.homepage);
         else
           websiteElement.setAttribute("aria-hidden", true);
       }
 
       let sourceElement = element.querySelector(".context-menu .source");
       if (sourceElement)
         sourceElement.setAttribute("href", item.url);
 
-      if (oldIndex != this.items.indexOf(item))

[Thomas Greiner, 2017/06/16 10:35:46]

Detail: `this.items.indexOf(item)` is duplicated so why not introduce a
`newIndex` variable to make things a bit easier to read?

[saroyanm, 2017/06/16 16:44:06]

Done.

-        table.insertBefore(element, table.childNodes[this.items.indexOf(item)]);
+      let newIndex = this.items.indexOf(item);
+      if (oldIndex != newIndex)
+        table.insertBefore(element, table.childNodes[newIndex]);
     }
   };
 
   Collection.prototype.clearAll = function()
   {
     this.items = [];
     for (let detail of this.details)
     {
       let table = E(detail.id);
       let element = table.firstChild;
@@ skipping 479 matching lines @@
 
     updateShareLink();
     updateTooltips();
 
     // Initialize interactive UI elements
     document.body.addEventListener("click", onClick, false);
     document.body.addEventListener("keyup", onKeyUp, false);
     let placeholderValue = getMessage("options_dialog_language_find");
     E("find-language").setAttribute("placeholder", placeholderValue);
     E("find-language").addEventListener("keyup", onFindLanguageKeyUp, false);
-    let exampleValue = getMessages("options_whitelist_placeholder_example", 

[saroyanm, 2017/06/14 11:51:22]

Nit: This should be getMessage(...)

[Thomas Greiner, 2017/06/16 10:35:46]

Indeed.

[saroyanm, 2017/06/16 16:43:07]

Done.

+    let exampleValue = getMessage("options_whitelist_placeholder_example", 
       ["www.example.com"]);
     E("whitelisting-textbox").setAttribute("placeholder", exampleValue);
     E("whitelisting-textbox").addEventListener("keyup", (e) =>
     {
-      let addWhitelistButton = E("whitelisting-add-button");
-      addWhitelistButton.disabled = false;
-      if (getKey(e) == "Enter")
-      {
-        if (!addWhitelistButton.disabled)
-          addWhitelistedDomain();

[Thomas Greiner, 2017/06/16 10:35:46]

This will clear the input field so the whitelist button should be disabled as
far as I understand.

To clarify this I'd propose to write:

let addWhitelistButton = E("whitelisting-add-button");
if (getKey(e) == "Enter")
{
  addWhitelistedDomain();
  e.target.value = "";
}
addWhitelistButton.disabled = !e.target.value;

and remove the line `domain = "";` from `addWhitelistedDomain()`.

[saroyanm, 2017/06/16 15:53:45]

We do need:
`
domain.value = "";
E("whitelisting-add-button").disabled = true;
`

Lines in `addWhitelistedDomain()`, while we need to execute that not only on
KeyUp, but also on click on the button.

I think the implementation should be changed in current way:
`
E("whitelisting-textbox").addEventListener("keyup", (e) =>
{
  addWhitelistButton.disabled = !e.target.value;
}, false);
`

And keep the addWhitelistedDomain(); as it is.. I think I just duplicated here
the logic which should only go to "addWhitelistedDomain()";

(I'll upload the fix with the new patch soon)

[saroyanm, 2017/06/16 16:43:07]

Done.

-      }
-      else
-      {
-        addWhitelistButton.disabled = !e.target.value;
-      }
+      E("whitelisting-add-button").disabled = !e.target.value;
     }, false);
 
     // Advanced tab
     let tweaks = document.querySelectorAll("#tweaks li[data-pref]");
     tweaks = Array.prototype.map.call(tweaks, (checkbox) =>
     {
       return checkbox.getAttribute("data-pref");
     });
     for (let key of tweaks)
     {
@@ skipping 251 matching lines @@
       message.homepage = homepage;
 
     ext.backgroundPage.sendMessage(message);
   }
 
   function onFilterMessage(action, filter)
   {
     switch (action)
     {
       case "added":
+        filter[timestampUI] = Date.now();
         updateFilter(filter);
         updateShareLink();
         break;
       case "loaded":
         populateLists();
         break;
       case "removed":
         let knownFilter = filtersMap[filter.text];
         collections.whitelist.removeItem(knownFilter);
         collections.customFilters.removeItem(knownFilter);
@@ skipping 260 matching lines @@
   });
   ext.backgroundPage.sendMessage({
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
              "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
   window.addEventListener("hashchange", onHashChange, false);
 }