Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: lib/iniParser.js

Issue 29946572: Issue 7094 - Keep subscription filters by text only (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Created Nov. 19, 2018, 2:08 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 this.subscriptions.push(subscription); 100 this.subscriptions.push(subscription);
101 break; 101 break;
102 102
103 case "subscription filters": 103 case "subscription filters":
104 if (this.subscriptions.length) 104 if (this.subscriptions.length)
105 { 105 {
106 let currentSubscription = this.subscriptions[ 106 let currentSubscription = this.subscriptions[
107 this.subscriptions.length - 1 107 this.subscriptions.length - 1
108 ]; 108 ];
109 for (let text of this._curObj) 109 for (let text of this._curObj)
110 { 110 currentSubscription.addFilterText(text);
111 let filter = Filter.fromText(text);
112 currentSubscription.addFilter(filter);
113 filter.addSubscription(currentSubscription);
114 }
115 } 111 }
116 break; 112 break;
117 } 113 }
118 } 114 }
119 115
120 if (line === null) 116 if (line === null)
121 return; 117 return;
122 118
123 this._curSection = match[1].toLowerCase(); 119 this._curSection = match[1].toLowerCase();
124 switch (this._curSection) 120 switch (this._curSection)
(...skipping 19 matching lines...) Expand all
144 } 140 }
145 finally 141 finally
146 { 142 {
147 Filter.knownFilters = origKnownFilters; 143 Filter.knownFilters = origKnownFilters;
148 Subscription.knownSubscriptions = origKnownSubscriptions; 144 Subscription.knownSubscriptions = origKnownSubscriptions;
149 } 145 }
150 } 146 }
151 } 147 }
152 148
153 exports.INIParser = INIParser; 149 exports.INIParser = INIParser;
OLDNEW
« lib/filterStorage.js ('K') | « lib/filterStorage.js ('k') | lib/subscriptionClasses.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld