| 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-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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 if (animationStep > 0) | 76 if (animationStep > 0) |
| 77 return; | 77 return; |
| 78 | 78 |
| 79 clearInterval(fadeOutInterval); | 79 clearInterval(fadeOutInterval); |
| 80 }, 100); | 80 }, 100); |
| 81 },1000); | 81 },1000); |
| 82 | 82 |
| 83 clearInterval(fadeInInterval); | 83 clearInterval(fadeInInterval); |
| 84 }, 100); | 84 }, 100); |
| 85 }); | 85 }); |
| 86 }, 15000); | 86 }, 10000); |
| 87 } | 87 } |
| 88 | 88 |
| 89 /** | 89 /** |
| 90 * Set the browser action icon for the given page, indicating whether | 90 * Set the browser action icon for the given page, indicating whether |
| 91 * adblocking is active there, and considering the icon animation. | 91 * adblocking is active there, and considering the icon animation. |
| 92 * | 92 * |
| 93 * @param {Page} page The page to set the browser action icon for | 93 * @param {Page} page The page to set the browser action icon for |
| 94 * @param {Boolean} whitelisted Whether the page has been whitelisted | 94 * @param {Boolean} whitelisted Whether the page has been whitelisted |
| 95 */ | 95 */ |
| 96 exports.updateIcon = function(page, whitelisted) | 96 exports.updateIcon = function(page, whitelisted) |
| (...skipping 21 matching lines...) Expand all Loading... |
| 118 exports.stopIconAnimation = function() | 118 exports.stopIconAnimation = function() |
| 119 { | 119 { |
| 120 if (animationInterval != null) | 120 if (animationInterval != null) |
| 121 { | 121 { |
| 122 clearInterval(animationInterval); | 122 clearInterval(animationInterval); |
| 123 animationInterval = null; | 123 animationInterval = null; |
| 124 } | 124 } |
| 125 | 125 |
| 126 notificationType = null; | 126 notificationType = null; |
| 127 }; | 127 }; |
| OLD | NEW |