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

Side by Side Diff: lib/api.js

Issue 29317074: Issue 2693 - Update adblockplus dependency (Closed)
Patch Set: rebase Created July 2, 2015, 1:37 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') | lib/notificationShowRegistration.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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 130
131 // These aren't normally properties of a Subscription object 131 // These aren't normally properties of a Subscription object
132 subscription.author = subscriptions[i].author; 132 subscription.author = subscriptions[i].author;
133 subscription.prefixes = subscriptions[i].prefixes; 133 subscription.prefixes = subscriptions[i].prefixes;
134 subscription.specialization = subscriptions[i].specialization; 134 subscription.specialization = subscriptions[i].specialization;
135 result.push(subscription); 135 result.push(subscription);
136 } 136 }
137 return result; 137 return result;
138 }, 138 },
139 139
140 getNextNotificationToShow: function(url) 140 showNextNotification: function(url)
141 { 141 {
142 return Notification.getNextToShow(url); 142 Notification.showNext(url);
143 }, 143 },
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);
(...skipping 30 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') | lib/notificationShowRegistration.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld