From 2b81b0bf11e03ab8828fa2e10f8aab1986684799 Mon Sep 17 00:00:00 2001 From: Ken Cheung Date: Fri, 21 Jun 2013 18:37:03 +0800 Subject: Update newmail_notifier to use W3C Notification Update newmail_notifier plugin to use W3C Notification object if possible. Include fix for Chrome/Chromium. --- plugins/newmail_notifier/newmail_notifier.js | 92 ++++++++++++++++++++-------- 1 file changed, 68 insertions(+), 24 deletions(-) (limited to 'plugins/newmail_notifier') diff --git a/plugins/newmail_notifier/newmail_notifier.js b/plugins/newmail_notifier/newmail_notifier.js index 7c9b55ded..320382a74 100644 --- a/plugins/newmail_notifier/newmail_notifier.js +++ b/plugins/newmail_notifier/newmail_notifier.js @@ -69,25 +69,50 @@ function newmail_notifier_sound() } } -// Desktop notification (need Chrome or Firefox with a plugin) +// Desktop notification +// - Require Chrome or Firefox latest version (22+) / 21.0 or older with a plugin function newmail_notifier_desktop(body) { - var dn = window.webkitNotifications; - - if (dn && !dn.checkPermission()) { - if (rcmail.newmail_popup) - rcmail.newmail_popup.cancel(); - var popup = window.webkitNotifications.createNotification('plugins/newmail_notifier/mail.png', - rcmail.gettext('title', 'newmail_notifier'), body); - popup.onclick = function() { - this.cancel(); + +/** + * Fix: As of 17 June 2013, Chrome/Chromium does not implement Notification.permission correctly that + * it gives 'undefined' until an object has been created: + * https://code.google.com/p/chromium/issues/detail?id=163226 + * + */ + try { + if (Notification.permission == 'granted' || Notification.permission == undefined) { + var popup = new Notification(rcmail.gettext('title', 'newmail_notifier'), { + dir: "auto", + lang: "", + body: body, + tag: "newmail_notifier", + icon: "plugins/newmail_notifier/mail.png", + }); + popup.onclick = function() { + this.close(); + } + setTimeout(function() { popup.close(); }, 10000); // close after 10 seconds + if (popup.permission == 'granted') return true; + } + } + catch (e) { + var dn = window.webkitNotifications; + + if (dn && !dn.checkPermission()) { + if (rcmail.newmail_popup) + rcmail.newmail_popup.cancel(); + var popup = window.webkitNotifications.createNotification('plugins/newmail_notifier/mail.png', + rcmail.gettext('title', 'newmail_notifier'), body); + popup.onclick = function() { + this.cancel(); + } + popup.show(); + setTimeout(function() { popup.cancel(); }, 10000); // close after 10 seconds + rcmail.newmail_popup = popup; + return true; } - popup.show(); - setTimeout(function() { popup.cancel(); }, 10000); // close after 10 seconds - rcmail.newmail_popup = popup; - return true; } - return false; } @@ -96,17 +121,27 @@ function newmail_notifier_test_desktop() var dn = window.webkitNotifications, txt = rcmail.gettext('testbody', 'newmail_notifier'); - if (dn) { - if (!dn.checkPermission()) - newmail_notifier_desktop(txt); + // W3C draft implementation (with fix for Chrome/Chromium) + try { + var testNotification = new window.Notification(txt, {tag: "newmail_notifier"}); // Try to show a test message + if (Notification.permission !== 'granted' || (testNotification.permission && testNotification.permission !== 'granted')) + newmail_notifier_desktop_authorize(); + } + // webkit implementation + catch (e) { + if (dn) { + if (!dn.checkPermission()) + newmail_notifier_desktop(txt); + else + dn.requestPermission(function() { + if (!newmail_notifier_desktop(txt)) + rcmail.display_message(rcmail.gettext('desktopdisabled', 'newmail_notifier'), 'error'); + }); + } else - dn.requestPermission(function() { - if (!newmail_notifier_desktop(txt)) - rcmail.display_message(rcmail.gettext('desktopdisabled', 'newmail_notifier'), 'error'); - }); + // Everything fails, means the browser has no support + rcmail.display_message(rcmail.gettext('desktopunsupported', 'newmail_notifier'), 'error'); } - else - rcmail.display_message(rcmail.gettext('desktopunsupported', 'newmail_notifier'), 'error'); } function newmail_notifier_test_basic() @@ -118,3 +153,12 @@ function newmail_notifier_test_sound() { newmail_notifier_sound(); } + +function newmail_notifier_desktop_authorize() { + Notification.requestPermission(function(perm) { + if (perm == 'denied') + rcmail.display_message(rcmail.gettext('desktopdisabled', 'newmail_notifier'), 'error'); + if (perm == 'granted') + newmail_notifier_test_desktop(); // Test again, which should show test message + }); +} \ No newline at end of file -- cgit v1.2.3 From 28d3ba505d6a2722dfb55c8fc697ec81a4f423d6 Mon Sep 17 00:00:00 2001 From: Rimas Kudelis Date: Fri, 12 Jul 2013 22:22:08 +0300 Subject: Don't set the dn variable unless it's needed. --- plugins/newmail_notifier/newmail_notifier.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/newmail_notifier') diff --git a/plugins/newmail_notifier/newmail_notifier.js b/plugins/newmail_notifier/newmail_notifier.js index 320382a74..b2d7cf497 100644 --- a/plugins/newmail_notifier/newmail_notifier.js +++ b/plugins/newmail_notifier/newmail_notifier.js @@ -118,8 +118,7 @@ function newmail_notifier_desktop(body) function newmail_notifier_test_desktop() { - var dn = window.webkitNotifications, - txt = rcmail.gettext('testbody', 'newmail_notifier'); + var txt = rcmail.gettext('testbody', 'newmail_notifier'); // W3C draft implementation (with fix for Chrome/Chromium) try { @@ -129,6 +128,7 @@ function newmail_notifier_test_desktop() } // webkit implementation catch (e) { + var dn = window.webkitNotifications; if (dn) { if (!dn.checkPermission()) newmail_notifier_desktop(txt); @@ -161,4 +161,4 @@ function newmail_notifier_desktop_authorize() { if (perm == 'granted') newmail_notifier_test_desktop(); // Test again, which should show test message }); -} \ No newline at end of file +} -- cgit v1.2.3 From 67a52526133c68443de451964e5da75c1be61c57 Mon Sep 17 00:00:00 2001 From: Rimas Kudelis Date: Fri, 12 Jul 2013 22:28:34 +0300 Subject: Extend basic notification to add a star icon overlay if we're in IE Pinned site mode (Win7+). The star icon is taken from Xiao Icon set (http://delacro.deviantart.com/art/Xiao-Icon-84772282). --- plugins/newmail_notifier/newmail_notifier.js | 14 ++++++++++++++ plugins/newmail_notifier/overlay.ico | Bin 0 -> 1150 bytes 2 files changed, 14 insertions(+) create mode 100644 plugins/newmail_notifier/overlay.ico (limited to 'plugins/newmail_notifier') diff --git a/plugins/newmail_notifier/newmail_notifier.js b/plugins/newmail_notifier/newmail_notifier.js index b2d7cf497..c398424b6 100644 --- a/plugins/newmail_notifier/newmail_notifier.js +++ b/plugins/newmail_notifier/newmail_notifier.js @@ -34,6 +34,13 @@ function newmail_notifier_stop(prop) $('').replaceAll('link[rel="shortcut icon"]'); rcmail.env.favicon_href = null; } + + // Remove IE icon overlay if we're pinned to Taskbar + try { + if(window.external.msIsSiteMode()) { + window.external.msSiteModeClearIconOverlay(); + } + } catch(e) {} } // Basic notification: window.focus and favicon change @@ -49,6 +56,13 @@ function newmail_notifier_basic() rcmail.env.favicon_href = oldlink.attr('href'); link.replaceAll(oldlink); + + // Add IE icon overlay if we're pinned to Taskbar + try { + if (window.external.msIsSiteMode()) { + window.external.msSiteModeSetIconOverlay('plugins/newmail_notifier/overlay.ico', rcmail.gettext('title', 'newmail_notifier')); + } + } catch(e) {} } // Sound notification diff --git a/plugins/newmail_notifier/overlay.ico b/plugins/newmail_notifier/overlay.ico new file mode 100644 index 000000000..17eb61a05 Binary files /dev/null and b/plugins/newmail_notifier/overlay.ico differ -- cgit v1.2.3