Index: background.js |
=================================================================== |
--- a/background.js |
+++ b/background.js |
@@ -33,6 +33,7 @@ |
var Prefs = require("prefs").Prefs; |
var Synchronizer = require("synchronizer").Synchronizer; |
var Utils = require("utils").Utils; |
+var Notification = require("notification").Notification; |
// Some types cannot be distinguished |
RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT; |
@@ -107,6 +108,8 @@ |
return (result instanceof WhitelistFilter ? result : null); |
} |
+var activeNotification = null; |
+ |
// Adds or removes page action icon according to options. |
function refreshIconAndContextMenu(tab) |
{ |
@@ -116,7 +119,11 @@ |
var excluded = isWhitelisted(tab.url); |
var iconFilename = excluded ? "icons/abp-19-whitelisted.png" : "icons/abp-19.png"; |
- chrome.pageAction.setIcon({tabId: tab.id, path: iconFilename}); |
+ |
+ if (activeNotification) |
+ startIconAnimation(tab, iconFilename); |
Wladimir Palant
2013/07/23 11:53:17
Don't we need to check whether this is actually th
Felix Dahlke
2013/07/23 12:52:02
I don't think it's necessary, since we only refres
|
+ else |
+ chrome.pageAction.setIcon({tabId: tab.id, path: iconFilename}); |
// Only show icon for pages we can influence (http: and https:) |
if(/^https?:/.test(tab.url)) |
@@ -473,6 +480,123 @@ |
} |
} |
+var iconAnimationTimer = null; |
+var animatedIconTab = null; |
+ |
+function stopIconAnimation() |
+{ |
+ if (!iconAnimationTimer) |
+ return; |
+ |
+ clearTimeout(iconAnimationTimer); |
+ iconAnimationTimer = null; |
+ animatedIconTab = null; |
Wladimir Palant
2013/07/23 11:53:17
refreshIconAndContextMenu(animatedIconTab)? Well,
Felix Dahlke
2013/07/23 12:52:02
Not necessary, no. I used to do that here, but rem
|
+} |
+ |
+function loadImages(imageFiles, callback) |
+{ |
+ var images = {}; |
+ var imagesLoaded = 0; |
+ imageFiles.forEach(function(imageFile) |
+ { |
+ var image = new Image(); |
+ image.src = imageFile; |
+ image.addEventListener("load", function() |
+ { |
+ images[imageFile] = image; |
+ if (++imagesLoaded === imageFiles.length) |
+ callback(images); |
+ }); |
+ }); |
+} |
+ |
+function startIconAnimation(tab, iconPath) |
+{ |
+ stopIconAnimation(); |
+ animatedIconTab = tab; |
+ |
+ var severitySuffix = activeNotification.severity === "critical" |
+ ? "critical" : "information"; |
+ var notificationIconPath = "icons/notification-" + severitySuffix + ".png"; |
+ var iconFiles = [iconPath, notificationIconPath]; |
+ loadImages(iconFiles, function(images) |
+ { |
+ var icon = images[iconPath]; |
+ var notificationIcon = images[notificationIconPath]; |
+ |
+ var canvas = document.createElement("canvas"); |
+ canvas.width = icon.width; |
+ canvas.height = icon.height; |
+ var context = canvas.getContext("2d"); |
+ |
+ var currentFrame = 0; |
+ var frameOpacities = [0, 0.2, 0.4, 0.6, 0.8, |
+ 1, 1, 1, 1, 1, |
+ 0.8, 0.6, 0.4, 0.2, 0]; |
+ |
+ function animationStep() |
+ { |
+ var opacity = frameOpacities[currentFrame]; |
+ context.clearRect(0, 0, canvas.width, canvas.height); |
+ context.globalAlpha = 1; |
+ context.drawImage(icon, 0, 0); |
+ context.globalAlpha = opacity; |
+ context.drawImage(notificationIcon, 0, 0); |
+ var imageData = context.getImageData(0, 0, canvas.width, canvas.height); |
+ chrome.pageAction.setIcon({tabId: tab.id, imageData: imageData}); |
+ |
+ var interval; |
+ currentFrame++; |
+ if (currentFrame < frameOpacities.length) |
+ { |
+ var duration = 3000; |
+ interval = duration / frameOpacities.length; |
+ } |
+ else |
+ { |
+ currentFrame = 0; |
+ interval = 10000; |
+ } |
+ iconAnimationTimer = setTimeout(animationStep, interval); |
+ } |
+ animationStep(); |
+ }); |
+} |
+ |
+function prepareNotificationIconAndPopup() |
+{ |
+ function refreshAll(tabs) |
+ { |
+ tabs.forEach(refreshIconAndContextMenu); |
+ } |
+ |
+ activeNotification.onClicked = function() |
+ { |
+ stopIconAnimation(); |
+ activeNotification = null; |
+ chrome.tabs.query(null, refreshAll); |
Wladimir Palant
2013/07/23 11:53:17
Do we still need to refresh all icons here?
if (a
Felix Dahlke
2013/07/23 12:52:02
Done. You're right, it's not necessary anymore now
|
+ }; |
+ |
+ chrome.windows.getLastFocused({populate: true}, function(window) |
+ { |
+ chrome.tabs.query({active: true, windowId: window.id}, refreshAll); |
+ }); |
+} |
+ |
+function showNotification(notification) |
+{ |
+ activeNotification = notification; |
+ |
+ if (activeNotification.severity === "critical") |
+ { |
+ var notification = webkitNotifications.createHTMLNotification("notification.html"); |
+ notification.show(); |
+ notification.addEventListener("close", prepareNotificationIconAndPopup); |
+ } |
+ else |
+ prepareNotificationIconAndPopup(); |
+} |
+ |
/** |
* This function is a hack - we only know the tabId and document URL for a |
* message but we need to know the frame ID. Try to find it in webRequest's |
@@ -609,3 +733,28 @@ |
if(changeInfo.status == "loading") |
refreshIconAndContextMenu(tab); |
}); |
+ |
+// Refresh icon when switching tabs or windows |
+chrome.tabs.onActivated.addListener(function(activeInfo) |
+{ |
+ refreshIconAndContextMenu(animatedIconTab); |
+ chrome.tabs.get(activeInfo.tabId, function(tab) |
+ { |
+ refreshIconAndContextMenu(tab); |
+ }); |
Wladimir Palant
2013/07/23 11:53:17
How about:
chrome.tabs.get(activeInfo.tabId, refr
Felix Dahlke
2013/07/23 12:52:02
Done.
|
+}); |
+chrome.windows.onFocusChanged.addListener(function(windowId) |
+{ |
+ refreshIconAndContextMenu(animatedIconTab); |
+ chrome.tabs.query({active: true, windowId: windowId}, function(tabs) |
+ { |
+ refreshIconAndContextMenu(tabs[0]); |
Wladimir Palant
2013/07/23 11:53:17
How about dropping the assumption that there is on
Felix Dahlke
2013/07/23 12:52:02
This should really only be one, but yeah, forEach
|
+ }); |
+}); |
+ |
+setTimeout(function() |
+{ |
+ var notificationToShow = Notification.getNextToShow(); |
+ if (notificationToShow) |
+ showNotification(notificationToShow); |
+}, 3 * 60 * 1000); |