Issue 2368 - Update adblockplus dependency to revision feb391127fe4

lib/notificationHelper.js

Index: lib/notificationHelper.js
===================================================================
--- a/lib/notificationHelper.js
+++ b/lib/notificationHelper.js
@@ -129,25 +129,8 @@
   chrome.notifications.onClosed.addListener(notificationClosed);
 }
 
-/**
- * Initializes the notification system.
- */
-exports.initNotifications = function()
+function showNotification(notification)
 {
-  if (canUseChromeNotifications)
-    initChromeNotifications();
-  initAntiAdblockNotification();
-};
-
-let showNextNotification =
-/**
- * Shows the next notification from the queue if any.
- *
- * @param {URL} [url] URL to match notifications to
- */
-exports.showNextNotification = function(url)
-{
-  let notification = NotificationStorage.getNextToShow(url && stringifyURL(url));
   if (!notification || activeNotification && activeNotification.id == notification.id)
     return;
 
@@ -227,6 +210,26 @@
 };
 
 /**
+ * Initializes the notification system.
+ */
+exports.initNotifications = function()
+{
+  if (canUseChromeNotifications)
+    initChromeNotifications();
+  initAntiAdblockNotification();
+};
+
+/**
+ * Shows the next notification for the supplied URL, if any.

[Sebastian Noack, 2015/06/12 17:14:19]

Mind removing ", if any", since its mandatory now?

[Felix Dahlke, 2015/06/12 17:56:11]

The "if any" was targeted at the notification, since there might not be one. But
it doesn't really matter to the caller here, removed the part to make things
less ambiguous.

[Sebastian Noack, 2015/06/12 18:12:51]

Argh, you are right. I misread it. I think it makes sense to leave the "if any"
there. It's more accurate. And might be unexpected otherwise, if no notification
is shown.

[Felix Dahlke, 2015/06/12 18:24:08]

Since the caller is not doing anything with the notification itself, I thought
it doesn't matter really. Anyway, think I've found a way to include this in an
unambiguous way now :)

+ *
+ * @param {URL} [url] URL to match notifications to

[Sebastian Noack, 2015/06/12 17:14:19]

Square brackets mean optional, which it isn't anymore.

[Felix Dahlke, 2015/06/12 17:56:11]

Done.

+ */
+exports.showNextNotificationForUrl = function(url)
+{
+  NotificationStorage.showNext(stringifyURL(url));
+}
+
+/**
  * Gets the active notification to be shown if any.
  *
  * @return {?object}
@@ -236,4 +239,7 @@
   return activeNotification;
 };
 
-setTimeout(showNextNotification, 3 * 60 * 1000);
+NotificationStorage.addShowListener(function(notification)
+{
+  showNotification(notification);
+});