Unified Diff: webrequest.js
Issue 6063199216467968:
Issue 2642 - Moved notifications code to separate module (Closed)
Patch Set: Moved intilization code into module
Created June 4, 2015, 9:35 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« lib/notificationHelper.js ('K')
|
« metadata.common ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: webrequest.js |
| =================================================================== |
| --- a/webrequest.js |
| +++ b/webrequest.js |
| @@ -18,6 +18,7 @@ |
| var FilterNotifier = require("filterNotifier").FilterNotifier; |
| var RegExpFilter = require("filterClasses").RegExpFilter; |
| var platform = require("info").platform; |
| +var showNextNotification = require("notificationHelper").showNextNotification; |
| ext.webRequest.indistinguishableTypes.forEach(function(types) |
| { |
| @@ -51,11 +52,7 @@ |
| // We can't listen to onHeadersReceived in Safari so we need to |
| // check for notifications here |
| if (platform != "chromium" && type == "SUBDOCUMENT") |
| - { |
| - var notificationToShow = NotificationStorage.getNextToShow(stringifyURL(url)); |
| - if (notificationToShow) |
| - showNotification(notificationToShow); |
| - } |
| + showNextNotification(url); |
| if (filter) |
| FilterNotifier.triggerListeners("filter.hitCount", filter, 0, 0, page); |
| @@ -99,9 +96,7 @@ |
| processKey(header.value, page, frame); |
| } |
| - var notificationToShow = NotificationStorage.getNextToShow(stringifyURL(new URL(details.url))); |
| - if (notificationToShow) |
| - showNotification(notificationToShow); |
| + showNextNotification(new URL(details.url)); |
| } |
| chrome.webRequest.onHeadersReceived.addListener( |
« lib/notificationHelper.js ('K')
|
« metadata.common ('k')
|
no next file »
|
no next file with comments »
