Issue 6856 - Remove FilterStorage.moveSubscription

lib/filterListener.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 90 matching lines @@
   filterNotifier.on("filter.lastHit", onFilterLastHit);
   filterNotifier.on("filter.added", onFilterAdded);
   filterNotifier.on("filter.removed", onFilterRemoved);
   filterNotifier.on("filter.disabled", onFilterDisabled);
   filterNotifier.on("filter.moved", onGenericChange);
 
   filterNotifier.on("subscription.added", onSubscriptionAdded);
   filterNotifier.on("subscription.removed", onSubscriptionRemoved);
   filterNotifier.on("subscription.disabled", onSubscriptionDisabled);
   filterNotifier.on("subscription.updated", onSubscriptionUpdated);
-  filterNotifier.on("subscription.moved", onGenericChange);
   filterNotifier.on("subscription.title", onGenericChange);
   filterNotifier.on("subscription.fixedTitle", onGenericChange);
   filterNotifier.on("subscription.homepage", onGenericChange);
   filterNotifier.on("subscription.downloadStatus", onGenericChange);
   filterNotifier.on("subscription.lastCheck", onGenericChange);
   filterNotifier.on("subscription.errors", onGenericChange);
 
   filterNotifier.on("load", onLoad);
   filterNotifier.on("save", onSave);
 
@@ skipping 23 matching lines @@
   let allowSnippets = false;
   for (let subscription of filter.subscriptions())
   {
     if (!subscription.disabled)
     {
       hasEnabled = true;
 
       // Allow snippets to be executed only by the circumvention lists or the
       // user's own filters.
       if (subscription.type == "circumvention" ||
           subscription.url == "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt" ||

[Jon Sonesen, 2018/09/27 15:14:05]

Pretty sure this is just a rebase change

           subscription instanceof SpecialSubscription)
       {
         allowSnippets = true;
         break;
       }
     }
   }
   if (!hasEnabled)
     return;
 
@@ skipping 164 matching lines @@
 
 function onLoad()
 {
   isDirty = 0;
 
   defaultMatcher.clear();
   ElemHide.clear();
   ElemHideEmulation.clear();
   ElemHideExceptions.clear();
   Snippets.clear();
-  for (let subscription of FilterStorage.subscriptions)
+  for (let subscription of FilterStorage.subscriptions())
   {
     if (!subscription.disabled)
       addFilters(subscription.filters);
   }
 }
 
 function onSave()
 {
   isDirty = 0;
 }