Issue 5873 - Show original subscription title in languages table

desktop-options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 72 matching lines @@
     let access = (item.url || item.text).replace(/'/g, "\\'");
     return function(container)
     {
       return container.querySelector("[data-access='" + access + "']");
     };
   };
 
   Collection.prototype._getItemTitle = function(item, i)
   {
     if (this.details[i].useSpecialization && item.specialization)
-      return item.specialization;
-    if (this.details[i].useOriginalTitle && item.originalTitle)
-      return item.originalTitle;
+    {

[ire, 2018/01/04 08:32:52]

NIT: I think this was cleaner without the nested `if`s

[saroyanm, 2018/01/04 21:28:52]

Yes, previously logic was bit different:
Previously, we were defining which attribute value to use, while with new
requirements we have an exceptional case, so I implemented:
if useSpacialization then use it and add English if aplicable.
While previously it was along the lines:
If useSpacialization then use it, if useOriginalTitle then use it.

I think you are right and my approach in general is wrong that why it doesn't
feel to be correct. I should have separated special case handling from core
"collection" functionality.

I did create a special case separate function, so we can specify custom function
for every special "_getItemTitle" case, so it will still fit into the logic of
collections.

I hope this implementation is more clear.

[ire, 2018/01/05 09:23:45]

Ack. Yes it is more clear, thanks!

+      let title = item.specialization;
+      if (item.originalTitle && item.originalTitle.indexOf("+EasyList") >= 0)

[ire, 2018/01/04 08:32:52]

NIT: I don't know if it actually makes a difference, but I always prefer
checking for `> -1` rather than `>= 0`. 

[saroyanm, 2018/01/04 21:28:52]

Done.

+        title += " + " + getMessage("options_english");
+      return title;
+    }
     return item.title || item.url || item.text;
   };
 
   Collection.prototype._sortItems = function()
   {
     this.items.sort((a, b) =>
     {
       // 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
@@ skipping 110 matching lines @@
     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);
-      let displays = element.querySelectorAll(".display");
+      let displays = element.querySelectorAll("[data-display]");
       for (let j = 0; j < displays.length; j++)
-        displays[j].textContent = title;
+      {
+        if (item[displays[j].dataset.display])
+          displays[j].textContent = item[displays[j].dataset.display];
+        else
+          displays[j].textContent = title;
+      }
 
       element.setAttribute("aria-label", title);
       if (this.details[i].searchable)
         element.setAttribute("data-search", title.toLowerCase());
       let controls = element.querySelectorAll(".control[role='checkbox']");
       for (let control of controls)
       {
         control.setAttribute("aria-checked", item.disabled == false);
         if (isAcceptableAds(item.url) && this == collections.filterLists)
           control.disabled = true;
@@ skipping 131 matching lines @@
   ]);
   collections.whitelist = new Collection([
     {
       id: "whitelisting-table",
       emptyTexts: ["options_whitelist_empty_1", "options_whitelist_empty_2"]
     }
   ]);
   collections.filterLists = new Collection([
     {
       id: "all-filter-lists-table",
-      emptyTexts: ["options_filterList_empty"],
-      useOriginalTitle: true
+      emptyTexts: ["options_filterList_empty"]
     }
   ]);
 
   function addSubscription(subscription)
   {
     let {disabled} = subscription;
     let collection = null;
     if (subscription.recommended)
     {
       if (subscription.recommended == "ads")
@@ skipping 1067 matching lines @@
   });
   browser.runtime.sendMessage({
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
              "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
   window.addEventListener("hashchange", onHashChange, false);
 }