Issue 3835 - Update dependency on adblockpluscore to revision 2d4888611240

chrome/content/ui/sidebar.js

Index: chrome/content/ui/sidebar.js
===================================================================
--- a/chrome/content/ui/sidebar.js
+++ b/chrome/content/ui/sidebar.js
@@ -325,17 +325,17 @@ function fillInTooltip(e) {
     }
 
     if (subscriptions.length)
     {
       let sourceElement = E("tooltipFilterSource");
       while (sourceElement.firstChild)
         sourceElement.removeChild(sourceElement.firstChild);
       for (let i = 0; i < subscriptions.length; i++)
-        setMultilineContent(sourceElement, subscriptions[i].title, true);
+        setMultilineContent(sourceElement, getSubscriptionTitle(subscriptions[i]), true);
     }
   }
 
   E("tooltipSizeRow").hidden = true;
   if (!("tooltip" in item))
   {
     getItemSize(item, (size) =>
     {
@@ -780,18 +780,18 @@ function compareDocDomain(item1, item2)
   else
     return 0;
 }
 
 function compareFilterSource(item1, item2)
 {
   let filter1 = getFilter(item1);
   let filter2 = getFilter(item2);
-  let subs1 = filter1 ? filter1.subscriptions.map(s => s.title).join(", ") : "";
-  let subs2 = filter2 ? filter2.subscriptions.map(s => s.title).join(", ") : "";
+  let subs1 = filter1 ? filter1.subscriptions.map(s => getSubscriptionTitle(s)).join(", ") : "";
+  let subs2 = filter2 ? filter2.subscriptions.map(s => getSubscriptionTitle(s)).join(", ") : "";
   if (subs1 < subs2)
     return -1;
   else if (subs1 > subs2)
     return 1;
   else
     return 0;
 }
 
@@ -920,17 +920,17 @@ var treeView = {
       else if (col == "docDomain")
         return this.data[row].docDomain + " " + (this.data[row].thirdParty ? docDomainThirdParty : docDomainFirstParty);
       else if (col == "filterSource")
       {
         let filter = getFilter(this.data[row])
         if (!filter)
           return "";
 
-        return filter.subscriptions.filter(s => !s.disabled).map(s => s.title).join(", ");
+        return filter.subscriptions.filter(s => !s.disabled).map(s => getSubscriptionTitle(s)).join(", ");
       }
       else
         return this.data[row].location;
     }
     else {
       // Empty list, show dummy
       if (row > 0 || (col != "address" && col != "filter"))
         return "";