Issue 3835 - Update dependency on adblockpluscore to revision 2d4888611240

chrome/content/ui/filters-subscriptionview.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 95 matching lines @@
     let disabledFilters = 0;
     for (let i = 0, l = subscription.filters.length; i < l; i++)
       if (subscription.filters[i] instanceof ActiveFilter && subscription.filters[i].disabled)
         disabledFilters++;
 
     let node = Templater.process(this._template, {
       __proto__: null,
       subscription: subscription,
       isExternal: subscription instanceof ExternalSubscription,
       downloading: Synchronizer.isExecuting(subscription.url),
-      disabledFilters: disabledFilters
+      disabledFilters: disabledFilters,
+      upgradeRequired: ListManager.isUpgradeRequired(subscription)
     });
     if (insertBefore)
       this._list.insertBefore(node, insertBefore);
     else
       this._list.appendChild(node);
     return node;
   },
 
   /**
    * Map indicating subscriptions that need their "disabledFilters" property to
@@ skipping 118 matching lines @@
       }
       case "subscription.title":
       case "subscription.disabled":
       case "subscription.homepage":
       case "subscription.lastDownload":
       case "subscription.downloadStatus":
       {
         let subscriptionNode = Templater.getNodeForData(this._list, "subscription", item);
         if (subscriptionNode)
         {
-          Templater.getDataForNode(subscriptionNode).downloading = Synchronizer.isExecuting(item.url);
+          let data = Templater.getDataForNode(subscriptionNode);
+          data.downloading = Synchronizer.isExecuting(item.url);
+          data.upgradeRequired = ListManager.isUpgradeRequired(item);
           Templater.update(this._template, subscriptionNode);
 
           if (!document.commandDispatcher.focusedElement)
             this._list.focus();
           this._listener();
         }
         break;
       }
       case "subscription.fixedTitle":
       {
@@ skipping 55 matching lines @@
       Synchronizer.execute(subscription);
   }
   else
     FilterStorage.removeSubscription(subscription);
 };
 
 /**
  * Checks whether Adblock Plus needs to be upgraded in order to support filters
  * in a particular subscription.
  */
 ListManager.isUpgradeRequired = function(/**Subscription*/ subscription)

[Thomas Greiner, 2016/03/18 16:43:22]

Where is this being used? In filters.xul (line 249) it's still checking
`hidden="{!subscription.upgradeRequired}"`.

[Wladimir Palant, 2016/03/19 18:59:13]

Ouch, not sure what happened here - part of the patch got lost. Fixed.

 {
   if (subscription instanceof DownloadableSubscription && subscription.requiredVersion)
   {
     let {addonVersion} = require("info");
     if (Services.vc.compare(subscription.requiredVersion, addonVersion) > 0)
       return true;
   }
   return false;
 };
 
 window.addEventListener("load", ListManager.init, false);