Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: background.js

Issue 6098518317989888: Fix: Notification popup is broken (Closed)
Patch Set: Already there Created Feb. 18, 2014, 5:48 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/ext/common.js » ('j') | chrome/ext/common.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: background.js
===================================================================
--- a/background.js
+++ b/background.js
@@ -292,16 +292,83 @@
iconAnimation.update(activeNotification.severity);
}
+function openNotificationLinks()
+{
+ if (activeNotification.links)
+ {
+ activeNotification.links.forEach(function(link)
+ {
+ ext.windows.getLastFocused(function(win)
+ {
+ win.openTab(Utils.getDocLink(link));
+ });
+ });
+ }
+ prepareNotificationIconAndPopup();
+}
+
+function notificationButtonClick(id, index)
+{
+ if (activeNotification.links && activeNotification.links[index])
+ {
+ ext.windows.getLastFocused(function(win)
+ {
+ win.openTab(Utils.getDocLink(activeNotification.links[index]));
+ });
+ }
+ prepareNotificationIconAndPopup();
+}
+
function showNotification(notification)
{
activeNotification = notification;
-
- if (activeNotification.severity === "critical"
- && typeof webkitNotifications !== "undefined")
+ if (activeNotification.severity === "critical")
{
- var notification = webkitNotifications.createHTMLNotification("notification.html");
- notification.show();
- notification.addEventListener("close", prepareNotificationIconAndPopup);
+ var hasWebkitNotifications = typeof webkitNotifications !== "undefined";
+ if (hasWebkitNotifications && "createHTMLNotification" in webkitNotifications)
+ {
+ var notification = webkitNotifications.createHTMLNotification("notification.html");
+ notification.show();
+ notification.addEventListener("close", prepareNotificationIconAndPopup, false);
+ return;
+ }
+
+ var texts = Notification.getLocalizedTexts(notification);
+ var title = texts.title ? texts.title : "";
+ var message = texts.message ? texts.message.replace(/<\/?(a|strong)>/g, "") : "";
+ var iconUrl = ext.getURL("icons/abp-128.png");
+ if ("notifications" in ext)
+ {
+ var opt = {
+ type: "basic",
+ title: title,
+ message: message,
+ iconUrl: iconUrl,
+ buttons: []
+ };
+ var regex = /<a>(.*?)<\/a>/g;
+ var message = texts.message ? texts.message : "";
Thomas Greiner 2014/02/19 09:25:56 To avoid any unintended sideeffects we shouldn't d
saroyanm 2014/02/19 13:14:42 Done.
+ while (regex.test(message))
+ opt.buttons.push({title: RegExp.$1});
+
+ var notification = ext.notifications;
+ notification.create("", opt, function() {});
+ notification.onClosed.addListener(prepareNotificationIconAndPopup);
+ notification.onButtonClicked.addListener(notificationButtonClick);
+ }
+ else if (hasWebkitNotifications && "createNotification" in webkitNotifications)
+ {
+ var notification = webkitNotifications.createNotification(iconUrl, title, message);
+ notification.show();
+ notification.addEventListener("close", prepareNotificationIconAndPopup, false);
+ notification.addEventListener("click", openNotificationLinks, false);
+ }
+ else
+ {
+ var notification = confirm(title + "\n" + message);
+ if (notification == true)
+ openNotificationLinks();
+ }
}
else
prepareNotificationIconAndPopup();
« no previous file with comments | « no previous file | chrome/ext/common.js » ('j') | chrome/ext/common.js » ('J')

Powered by Google App Engine
This is Rietveld