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

Side by Side Diff: lib/api.js

Issue 11021064: Fixed: domain options aren`t treated correctly by the matcher (Closed)
Patch Set: Created July 5, 2013, 12:39 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 | test/FilterEngine.cpp » ('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 <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2013 Eyeo GmbH 3 * Copyright (C) 2006-2013 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 result.push(subscription); 134 result.push(subscription);
135 } 135 }
136 return result; 136 return result;
137 }, 137 },
138 138
139 checkFilterMatch: function(url, contentType, documentUrl) 139 checkFilterMatch: function(url, contentType, documentUrl)
140 { 140 {
141 var requestHost = extractHostFromURL(url); 141 var requestHost = extractHostFromURL(url);
142 var documentHost = extractHostFromURL(documentUrl); 142 var documentHost = extractHostFromURL(documentUrl);
143 var thirdParty = isThirdParty(requestHost, documentHost); 143 var thirdParty = isThirdParty(requestHost, documentHost);
144 return defaultMatcher.matchesAny(url, contentType, documentUrl, thirdParty ); 144 return defaultMatcher.matchesAny(url, contentType, documentHost, thirdPart y);
145 }, 145 },
146 146
147 getElementHidingSelectors: function(domain) 147 getElementHidingSelectors: function(domain)
148 { 148 {
149 return ElemHide.getSelectorsForDomain(domain, false); 149 return ElemHide.getSelectorsForDomain(domain, false);
150 }, 150 },
151 151
152 getPref: function(pref) 152 getPref: function(pref)
153 { 153 {
154 return Prefs[pref]; 154 return Prefs[pref];
155 }, 155 },
156 156
157 setPref: function(pref, value) 157 setPref: function(pref, value)
158 { 158 {
159 Prefs[pref] = value; 159 Prefs[pref] = value;
160 }, 160 },
161 161
162 forceUpdateCheck: function(eventName) 162 forceUpdateCheck: function(eventName)
163 { 163 {
164 checkForUpdates(true, _triggerEvent.bind(null, eventName)); 164 checkForUpdates(true, _triggerEvent.bind(null, eventName));
165 } 165 }
166 }; 166 };
167 })(); 167 })();
OLDNEW
« no previous file with comments | « no previous file | test/FilterEngine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld