 Issue 29339387:
  Issue 3890 - Fix "Downloading..." indication for subscriptions on the options page  (Closed)
    
  
    Issue 29339387:
  Issue 3890 - Fix "Downloading..." indication for subscriptions on the options page  (Closed) 
  | Left: | ||
| Right: | 
| OLD | NEW | 
|---|---|
| 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 Loading... | |
| 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; | |
| 
Sebastian Noack
2016/04/05 18:38:48
This was wrong. The lastDownload property isn't re
 | |
| 291 modules.synchronizer.Synchronizer._downloading = true; | 290 modules.synchronizer.Synchronizer._downloading = true; | 
| 291 modules.filterNotifier.FilterNotifier.emit("subscription.downloading", s ubscription); | |
| 
kzar
2016/04/06 08:53:37
Nit: Mind breaking this long line at the comma?
 
Sebastian Noack
2016/04/06 09:13:00
Done.
 | |
| 292 setTimeout(function() | 292 setTimeout(function() | 
| 293 { | 293 { | 
| 294 modules.synchronizer.Synchronizer._downloading = false; | 294 modules.synchronizer.Synchronizer._downloading = false; | 
| 295 subscription.lastDownload = Date.now() / 1000; | 295 subscription.lastDownload = Date.now() / 1000; | 
| 296 }, 500); | 296 }, 500); | 
| 297 }, | 297 }, | 
| 298 isExecuting: function(url) | 298 isExecuting: function(url) | 
| 299 { | 299 { | 
| 300 return modules.synchronizer.Synchronizer._downloading; | 300 return modules.synchronizer.Synchronizer._downloading; | 
| 301 } | 301 } | 
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 479 | 479 | 
| 480 if (params.safariContentBlocker) | 480 if (params.safariContentBlocker) | 
| 481 { | 481 { | 
| 482 global.safari = { | 482 global.safari = { | 
| 483 extension: { | 483 extension: { | 
| 484 setContentBlocker: function() {} | 484 setContentBlocker: function() {} | 
| 485 } | 485 } | 
| 486 }; | 486 }; | 
| 487 } | 487 } | 
| 488 })(this); | 488 })(this); | 
| OLD | NEW |