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

Delta Between Two Patch Sets: lib/matcher.js

Issue 29897555: Issue 6940 - Use underscore prefixes lib/matcher.js (Closed)
Left Patch Set: Address PS5 Comment Created Oct. 23, 2018, 5:38 p.m.
Right Patch Set: Address PS6 comment Created Oct. 24, 2018, 6:47 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | test/filterListener.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 * @param {string} location 172 * @param {string} location
173 * @param {number} typeMask 173 * @param {number} typeMask
174 * @param {string} [docDomain] 174 * @param {string} [docDomain]
175 * @param {boolean} [thirdParty] 175 * @param {boolean} [thirdParty]
176 * @param {string} [sitekey] 176 * @param {string} [sitekey]
177 * @param {boolean} [specificOnly] 177 * @param {boolean} [specificOnly]
178 * @returns {?Filter} 178 * @returns {?Filter}
179 * @protected 179 * @protected
180 */ 180 */
181 checkEntryMatch(keyword, location, typeMask, docDomain, thirdParty, sitekey, 181 checkEntryMatch(keyword, location, typeMask, docDomain, thirdParty, sitekey,
182 specificOnly) 182 specificOnly)
Manish Jethani 2018/10/24 18:43:54 Sorry, I missed this one. We need to fix the align
Jon Sonesen 2018/10/24 18:46:26 oof, good catch
183 { 183 {
184 let set = this._filterByKeyword.get(keyword); 184 let set = this._filterByKeyword.get(keyword);
185 if (typeof set == "undefined") 185 if (typeof set == "undefined")
186 return null; 186 return null;
187 187
188 for (let filter of set) 188 for (let filter of set)
189 { 189 {
190 if (specificOnly && filter.isGeneric() && 190 if (specificOnly && filter.isGeneric() &&
191 !(filter instanceof WhitelistFilter)) 191 !(filter instanceof WhitelistFilter))
192 continue; 192 continue;
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 396
397 exports.CombinedMatcher = CombinedMatcher; 397 exports.CombinedMatcher = CombinedMatcher;
398 398
399 /** 399 /**
400 * Shared {@link CombinedMatcher} instance that should usually be used. 400 * Shared {@link CombinedMatcher} instance that should usually be used.
401 * @type {CombinedMatcher} 401 * @type {CombinedMatcher}
402 */ 402 */
403 let defaultMatcher = new CombinedMatcher(); 403 let defaultMatcher = new CombinedMatcher();
404 404
405 exports.defaultMatcher = defaultMatcher; 405 exports.defaultMatcher = defaultMatcher;
LEFTRIGHT

Powered by Google App Engine
This is Rietveld