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

Side by Side Diff: chrome/content/ui/sendReport.js

Issue 29333159: Issue 3407 - Remove Policy.isWindowWhitelisted() method and its callers (Closed)
Patch Set: Removed unrelated change Created Jan. 4, 2016, 7:34 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/content/ui/sidebar.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 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 900 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 { 911 {
912 return subscriptionsDataSource.subscriptionFilter(s); 912 return subscriptionsDataSource.subscriptionFilter(s);
913 } 913 }
914 else 914 else
915 return false; 915 return false;
916 }, 916 },
917 917
918 collectData: function(wnd, windowURI, callback) 918 collectData: function(wnd, windowURI, callback)
919 { 919 {
920 this.contentWnd = wnd; 920 this.contentWnd = wnd;
921 this.whitelistFilter = Policy.isWindowWhitelisted(wnd); 921 this.whitelistFilter = Policy.isWhitelisted(windowURI.spec);
Thomas Greiner 2016/01/05 15:12:24 In line 591 we implement a fallback for when `wind
Wladimir Palant 2016/01/05 15:22:48 No, we will rather have to fix line 591 as part of
Thomas Greiner 2016/01/05 16:19:55 Fine with me then.
922 922
923 if (!this.whitelistFilter && this.isEnabled) 923 if (!this.whitelistFilter && this.isEnabled)
924 { 924 {
925 // Find disabled filters in active subscriptions matching any of the reque sts 925 // Find disabled filters in active subscriptions matching any of the reque sts
926 let disabledMatcher = new CombinedMatcher(); 926 let disabledMatcher = new CombinedMatcher();
927 for (let subscription of FilterStorage.subscriptions) 927 for (let subscription of FilterStorage.subscriptions)
928 { 928 {
929 if (subscription.disabled) 929 if (subscription.disabled)
930 continue; 930 continue;
931 931
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
1590 1590
1591 function censorURL(url) 1591 function censorURL(url)
1592 { 1592 {
1593 return url.replace(/([?;&\/#][^?;&\/#]+?=)[^?;&\/#]+/g, "$1*"); 1593 return url.replace(/([?;&\/#][^?;&\/#]+?=)[^?;&\/#]+/g, "$1*");
1594 } 1594 }
1595 1595
1596 function encodeHTML(str) 1596 function encodeHTML(str)
1597 { 1597 {
1598 return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;"). replace(/"/g, "&quot;"); 1598 return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;"). replace(/"/g, "&quot;");
1599 } 1599 }
OLDNEW
« no previous file with comments | « no previous file | chrome/content/ui/sidebar.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld