Unified Diff: lib/rules.js
Issue 8382011:
Applied changes from emailed code review (Closed)
Patch Set: Applied remaining changes
Created Sept. 26, 2012, 9:02 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« lib/appIntegration.js ('K')
|
« lib/appIntegration.js ('k')
|
lib/survey.js » ('j')
|
lib/survey.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/rules.js |
| =================================================================== |
| --- a/lib/rules.js |
| +++ b/lib/rules.js |
| @@ -150,6 +150,13 @@ |
| else |
| domain = domain.replace(searchString, replacement); |
| } |
| + |
| + // Apply user's whitelist |
| + let whitelist = Prefs.whitelist; |
| + if (whitelist.hasOwnProperty(domain) || /^www\./.test(domain) && whitelist.hasOwnProperty(domain.substr(4))) |
| + { |
| + return domain; |
| + } |
| // Now apply our rules on the domain name |
| for (let i = 0, l = rules.expressions.length; i < l; i++) |
« lib/appIntegration.js ('K')
|
« lib/appIntegration.js ('k')
|
lib/survey.js » ('j')
|
lib/survey.js » ('J')
