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

Side by Side Diff: lib/api.js

Issue 29335462: Issue 3337 - Update adblockplus reference in libadblockplus to revision hg:813682c7161e (Closed)
Patch Set: rebase Created April 19, 2016, 9:27 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 | « include/AdblockPlus/FilterEngine.h ('k') | libadblockplus.gyp » ('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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 getNotificationTexts: function(notification) 145 getNotificationTexts: function(notification)
146 { 146 {
147 return Notification.getLocalizedTexts(notification); 147 return Notification.getLocalizedTexts(notification);
148 }, 148 },
149 149
150 markNotificationAsShown: function(id) 150 markNotificationAsShown: function(id)
151 { 151 {
152 Notification.markAsShown(id); 152 Notification.markAsShown(id);
153 }, 153 },
154 checkFilterMatch: function(url, contentType, documentUrl) 154 checkFilterMatch: function(url, contentTypeMask, documentUrl)
155 { 155 {
156 var requestHost = extractHostFromURL(url); 156 var requestHost = extractHostFromURL(url);
157 var documentHost = extractHostFromURL(documentUrl); 157 var documentHost = extractHostFromURL(documentUrl);
158 var thirdParty = isThirdParty(requestHost, documentHost); 158 var thirdParty = isThirdParty(requestHost, documentHost);
159 return defaultMatcher.matchesAny(url, contentType, documentHost, thirdPart y); 159 return defaultMatcher.matchesAny(url, contentTypeMask, documentHost, third Party);
160 }, 160 },
161 161
162 getElementHidingSelectors: function(domain) 162 getElementHidingSelectors: function(domain)
163 { 163 {
164 return ElemHide.getSelectorsForDomain(domain, false); 164 return ElemHide.getSelectorsForDomain(domain, false);
165 }, 165 },
166 166
167 getPref: function(pref) 167 getPref: function(pref)
168 { 168 {
169 return Prefs[pref]; 169 return Prefs[pref];
(...skipping 13 matching lines...) Expand all
183 { 183 {
184 return extractHostFromURL(url); 184 return extractHostFromURL(url);
185 }, 185 },
186 186
187 compareVersions: function(v1, v2) 187 compareVersions: function(v1, v2)
188 { 188 {
189 return Services.vc.compare(v1, v2); 189 return Services.vc.compare(v1, v2);
190 } 190 }
191 }; 191 };
192 })(); 192 })();
OLDNEW
« no previous file with comments | « include/AdblockPlus/FilterEngine.h ('k') | libadblockplus.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld