Issue 3835 - Update dependency on adblockpluscore to revision 2d4888611240

chrome/content/ui/filters-subscriptionactions.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 277 matching lines @@
    * Called when a subscription entry is dragged.
    */
   startDrag: function(/**Event*/ event, /**Node*/ node)
   {
     let data = Templater.getDataForNode(node);
     if (!data)
       return;
 
     event.dataTransfer.addElement(node);
     event.dataTransfer.setData("text/x-moz-url", data.subscription.url);
-    event.dataTransfer.setData("text/plain", data.subscription.title);
+    event.dataTransfer.setData("text/plain", getSubscriptionTitle(data.subscription));
     this.dragSubscription = data.subscription;
     event.stopPropagation();
   },
 
   /**
    * Called when something is dragged over a subscription entry or subscriptions list.
    */
   dragOver: function(/**Event*/ event)
   {
     // Don't allow dragging onto a scroll bar
@@ skipping 106 matching lines @@
     let subscriptionNode = Templater.getDataNode(node);
     if (!subscriptionNode || (checkSelection && !subscriptionNode._wasSelected))
       return;
 
     let subscription = Templater.getDataForNode(subscriptionNode).subscription;
     if (!subscription || subscription.fixedTitle)
       return;
 
     subscriptionNode.getElementsByClassName("titleBox")[0].selectedIndex = 1;
     let editor = subscriptionNode.getElementsByClassName("titleEditor")[0];
-    editor.value = subscription.title;
+    editor.value = getSubscriptionTitle(subscription);
     editor.setSelectionRange(0, editor.value.length);
     this.subscriptionEdited = subscriptionNode;
     editor.focus();
   },
 
   /**
    * Stops editing of a subscription title.
    * @param {Boolean} save if true the entered value will be saved, otherwise dismissed
    */
   end: function(save)
@@ skipping 161 matching lines @@
       return;
 
     if (event.keyCode == event.DOM_VK_RETURN || event.keyCode == event.DOM_VK_ENTER)
     {
       // This shouldn't accept our dialog, only the panel
       event.preventDefault();
       E("selectSubscriptionAccept").doCommand();
     }
   }
 };