| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2013 Eyeo GmbH | 3 * Copyright (C) 2006-2013 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 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 579 { | 579 { |
| 580 tabs.forEach(refreshIconAndContextMenu); | 580 tabs.forEach(refreshIconAndContextMenu); |
| 581 }); | 581 }); |
| 582 }); | 582 }); |
| 583 } | 583 } |
| 584 | 584 |
| 585 function showNotification(notification) | 585 function showNotification(notification) |
| 586 { | 586 { |
| 587 activeNotification = notification; | 587 activeNotification = notification; |
| 588 | 588 |
| 589 if (activeNotification.severity === "critical") | 589 if (activeNotification.severity === "critical" |
| 590 && typeof webkitNotifications !== "undefined") |
| 590 { | 591 { |
| 591 var notification = webkitNotifications.createHTMLNotification("notification.
html"); | 592 var notification = webkitNotifications.createHTMLNotification("notification.
html"); |
| 592 notification.show(); | 593 notification.show(); |
| 593 notification.addEventListener("close", prepareNotificationIconAndPopup); | 594 notification.addEventListener("close", prepareNotificationIconAndPopup); |
| 594 } | 595 } |
| 595 else | 596 else |
| 596 prepareNotificationIconAndPopup(); | 597 prepareNotificationIconAndPopup(); |
| 597 } | 598 } |
| 598 | 599 |
| 599 /** | 600 /** |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 747 tabs.forEach(refreshIconAndContextMenu); | 748 tabs.forEach(refreshIconAndContextMenu); |
| 748 }); | 749 }); |
| 749 }); | 750 }); |
| 750 | 751 |
| 751 setTimeout(function() | 752 setTimeout(function() |
| 752 { | 753 { |
| 753 var notificationToShow = Notification.getNextToShow(); | 754 var notificationToShow = Notification.getNextToShow(); |
| 754 if (notificationToShow) | 755 if (notificationToShow) |
| 755 showNotification(notificationToShow); | 756 showNotification(notificationToShow); |
| 756 }, 3 * 60 * 1000); | 757 }, 3 * 60 * 1000); |
| OLD | NEW |