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

Side by Side Diff: background.js

Issue 29339387: Issue 3890 - Fix "Downloading..." indication for subscriptions on the options page (Closed)
Patch Set: Pass URL to Synchronizer.isExecuting() Created April 6, 2016, 5:20 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 | messageResponder.js » ('j') | options.js » ('J')
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 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 errors: [] 280 errors: []
281 }; 281 };
282 } 282 }
283 }; 283 };
284 284
285 modules.synchronizer = { 285 modules.synchronizer = {
286 Synchronizer: { 286 Synchronizer: {
287 _downloading: false, 287 _downloading: false,
288 execute: function(subscription, manual) 288 execute: function(subscription, manual)
289 { 289 {
290 subscription.lastDownload = 0;
291 modules.synchronizer.Synchronizer._downloading = true; 290 modules.synchronizer.Synchronizer._downloading = true;
291 modules.filterNotifier.FilterNotifier.emit(
292 "subscription.downloading", subscription
293 );
292 setTimeout(function() 294 setTimeout(function()
293 { 295 {
294 modules.synchronizer.Synchronizer._downloading = false; 296 modules.synchronizer.Synchronizer._downloading = false;
295 subscription.lastDownload = Date.now() / 1000; 297 subscription.lastDownload = Date.now() / 1000;
296 }, 500); 298 }, 500);
297 }, 299 },
298 isExecuting: function(url) 300 isExecuting: function(url)
299 { 301 {
300 return modules.synchronizer.Synchronizer._downloading; 302 return modules.synchronizer.Synchronizer._downloading;
301 } 303 }
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 481
480 if (params.safariContentBlocker) 482 if (params.safariContentBlocker)
481 { 483 {
482 global.safari = { 484 global.safari = {
483 extension: { 485 extension: {
484 setContentBlocker: function() {} 486 setContentBlocker: function() {}
485 } 487 }
486 }; 488 };
487 } 489 }
488 })(this); 490 })(this);
OLDNEW
« no previous file with comments | « no previous file | messageResponder.js » ('j') | options.js » ('J')

Powered by Google App Engine
This is Rietveld