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

Delta Between Two Patch Sets: background.js

Issue 29322488: Issue 2376 - mockup causing error (Closed)
Left Patch Set: Created July 15, 2015, 5:26 p.m.
Right Patch Set: Fixed 80 char limit Created July 15, 2015, 5:54 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 { 168 {
169 169
170 if (params.filterError) 170 if (params.filterError)
171 return {error: "Invalid filter"}; 171 return {error: "Invalid filter"};
172 return {filter: modules.filterClasses.Filter.fromText(text)}; 172 return {filter: modules.filterClasses.Filter.fromText(text)};
173 }, 173 },
174 parseFilters: function(text) 174 parseFilters: function(text)
175 { 175 {
176 if (params.filterError) 176 if (params.filterError)
177 return {errors: ["Invalid filter"]}; 177 return {errors: ["Invalid filter"]};
178 return {filters: 178 return {
179 text.split("\n").map(modules.filterClasses.Filter.fromText), error s: []}; 179 filters: text.split("\n").map(modules.filterClasses.Filter.fromText),
Thomas Greiner 2015/07/15 17:52:50 Again, mind the 80 characters limit. I'd suggest u
saroyanm 2015/07/15 17:56:57 Done.
180 errors: []
181 };
180 } 182 }
181 }; 183 };
182 184
183 modules.synchronizer = { 185 modules.synchronizer = {
184 Synchronizer: {} 186 Synchronizer: {}
185 }; 187 };
186 188
187 modules.matcher = { 189 modules.matcher = {
188 defaultMatcher: { 190 defaultMatcher: {
189 matchesAny: function(url, requestType, docDomain, thirdParty) 191 matchesAny: function(url, requestType, docDomain, thirdParty)
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 type: "message", 292 type: "message",
291 payload: { 293 payload: {
292 title: "Custom subscription", 294 title: "Custom subscription",
293 url: "http://example.com/custom.txt", 295 url: "http://example.com/custom.txt",
294 type: "add-subscription" 296 type: "add-subscription"
295 } 297 }
296 }, "*"); 298 }, "*");
297 }, 1000); 299 }, 1000);
298 } 300 }
299 })(this); 301 })(this);
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld