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: Popup notification fix Created Feb. 26, 2014, 4:14 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 | « _locales/en_US/messages.json ('k') | chrome/ext/background.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: background.js
===================================================================
--- a/background.js
+++ b/background.js
@@ -286,22 +286,98 @@
activeNotification.onClicked = function()
{
iconAnimation.stop();
- activeNotification = null;
};
+
Felix Dahlke 2014/02/26 17:22:58 Why did you change this logic?
Thomas Greiner 2014/02/26 17:37:35 @Felix The problem is that onClicked is never call
Felix Dahlke 2014/02/26 17:47:10 Ah I see. That event handler name is a bit confusi
saroyanm 2014/02/26 18:15:34 @Thomas but the current approach with createHTMLNo
saroyanm 2014/02/26 18:25:08 From My point of view, the logic should change: We
+ iconAnimation.update(activeNotification.severity);
+ activeNotification = null;
+}
- iconAnimation.update(activeNotification.severity);
+function openNotificationLinks()
+{
+ if (activeNotification.links)
+ {
+ activeNotification.links.forEach(function(link)
+ {
+ ext.windows.getLastFocused(function(win)
+ {
+ win.openTab(Utils.getDocLink(link));
+ });
+ });
+ }
+}
+
+function notificationButtonClick(id, index)
+{
+ if (activeNotification.links && activeNotification.links[index])
+ {
+ ext.windows.getLastFocused(function(win)
+ {
+ win.openTab(Utils.getDocLink(activeNotification.links[index]));
+ });
+ }
}
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 || "";
+ var message = texts.message ? texts.message.replace(/<\/?(a|strong)>/g, "") : "";
+ var iconUrl = ext.getURL("icons/abp-128.png");
+ var hasLinks = activeNotification.links && activeNotification.links.length > 0;
+ if ("browserNotifications" in ext)
+ {
+ var opts = {
+ type: "basic",
+ title: title,
+ message: message,
+ iconUrl: iconUrl,
+ buttons: []
+ };
+ var regex = /<a>(.*?)<\/a>/g;
+ var plainMessage = texts.message || "";
+ var match;
+ while (match = regex.exec(plainMessage))
+ opts.buttons.push({title: match[1]});
+
+ var notification = ext.browserNotifications;
+ notification.create("", opts, function() {});
+ notification.onClosed.addListener(prepareNotificationIconAndPopup);
+ notification.onButtonClicked.addListener(notificationButtonClick);
+ }
+ else if (hasWebkitNotifications && "createNotification" in webkitNotifications)
+ {
+ if (hasLinks)
+ message += " " + ext.i18n.getMessage("notification_without_buttons");
+
+ var notification = webkitNotifications.createNotification(iconUrl, title, message);
+ notification.show();
+ notification.addEventListener("close", prepareNotificationIconAndPopup, false);
+ notification.addEventListener("click", openNotificationLinks, false);
+ }
+ else
+ {
+ var message = title + "\n" + message;
+ if (hasLinks)
+ message += "\n\n" + ext.i18n.getMessage("notification_with_buttons");
+
+ var notification = confirm(message);
+ if (notification == true)
+ openNotificationLinks();
+ else
+ prepareNotificationIconAndPopup();
+ }
}
else
prepareNotificationIconAndPopup();
« no previous file with comments | « _locales/en_US/messages.json ('k') | chrome/ext/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld