Issue 3835 - Update dependency on adblockpluscore to revision 2d4888611240

chrome/content/ui/sidebar.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
@@ skipping 312 matching lines @@
       disabledText.textContent = filterField.getAttribute("disabledText");
       filterField.appendChild(disabledText);
     }
 
     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) =>
     {
       if (size)
       {
@@ skipping 434 matching lines @@
   else if (!item1.thirdParty && item2.thirdParty)
     return 1;
   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;
 }
 
 function createSortWithFallback(cmpFunc, fallbackFunc, desc) {
   var factor = (desc ? -1 : 1);
@@ skipping 118 matching lines @@
         return (size ? size.join(" x ") : "");
       }
       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 "";
       if (col == "filter") {
         var filter = Policy.isWhitelisted(contentLocation);
@@ skipping 377 matching lines @@
       return {tooltip: this.itemsDummyTooltip};
   },
 
   invalidateItem: function(item)
   {
     let row = this.data.indexOf(item);
     if (row >= 0)
       this.boxObject.invalidateRow(row);
   }
 }