OLD | NEW |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-present eyeo GmbH | 3 * Copyright (C) 2006-present eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 removeSubscription(subscription) | 141 removeSubscription(subscription) |
142 { | 142 { |
143 for (let i = 0; i < FilterStorage.subscriptions.length; i++) | 143 for (let i = 0; i < FilterStorage.subscriptions.length; i++) |
144 { | 144 { |
145 if (FilterStorage.subscriptions[i].url == subscription.url) | 145 if (FilterStorage.subscriptions[i].url == subscription.url) |
146 { | 146 { |
147 removeSubscriptionFilters(subscription); | 147 removeSubscriptionFilters(subscription); |
148 | 148 |
149 FilterStorage.subscriptions.splice(i--, 1); | 149 FilterStorage.subscriptions.splice(i--, 1); |
150 FilterStorage.knownSubscriptions.delete(subscription.url); | 150 FilterStorage.knownSubscriptions.delete(subscription.url); |
| 151 |
| 152 // This should be the last remaining reference to the Subscription |
| 153 // object. |
| 154 Subscription.knownSubscriptions.delete(subscription.url); |
| 155 |
151 FilterNotifier.triggerListeners("subscription.removed", subscription); | 156 FilterNotifier.triggerListeners("subscription.removed", subscription); |
152 return; | 157 return; |
153 } | 158 } |
154 } | 159 } |
155 }, | 160 }, |
156 | 161 |
157 /** | 162 /** |
158 * Moves a subscription in the list to a new position. | 163 * Moves a subscription in the list to a new position. |
159 * @param {Subscription} subscription filter subscription to be moved | 164 * @param {Subscription} subscription filter subscription to be moved |
160 * @param {Subscription} [insertBefore] filter subscription to insert before | 165 * @param {Subscription} [insertBefore] filter subscription to insert before |
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
766 else if (this.wantObj === false && val) | 771 else if (this.wantObj === false && val) |
767 this.curObj.push(val.replace(/\\\[/g, "[")); | 772 this.curObj.push(val.replace(/\\\[/g, "[")); |
768 } | 773 } |
769 finally | 774 finally |
770 { | 775 { |
771 Filter.knownFilters = origKnownFilters; | 776 Filter.knownFilters = origKnownFilters; |
772 Subscription.knownSubscriptions = origKnownSubscriptions; | 777 Subscription.knownSubscriptions = origKnownSubscriptions; |
773 } | 778 } |
774 } | 779 } |
775 }; | 780 }; |
OLD | NEW |