Page MenuHomePhorge
Files F2527631

No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

View Options

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
@@ -1,120 +1,164 @@
/**
* New Mail Notifier plugin script
*
* @version @package_version@
* @author Aleksander Machniak <alec@alec.pl>
*/
if (window.rcmail && rcmail.env.task == 'mail') {
rcmail.addEventListener('plugin.newmail_notifier', newmail_notifier_run);
rcmail.addEventListener('actionbefore', newmail_notifier_stop);
rcmail.addEventListener('init', function() {
// bind to messages list select event, so favicon will be reverted on message preview too
if (rcmail.message_list)
rcmail.message_list.addEventListener('select', newmail_notifier_stop);
});
}
// Executes notification methods
function newmail_notifier_run(prop)
{
if (prop.basic)
newmail_notifier_basic();
if (prop.sound)
newmail_notifier_sound();
if (prop.desktop)
newmail_notifier_desktop(rcmail.gettext('body', 'newmail_notifier'));
}
// Stops notification
function newmail_notifier_stop(prop)
{
// revert original favicon
if (rcmail.env.favicon_href && (!prop || prop.action != 'check-recent')) {
$('<link rel="shortcut icon" href="'+rcmail.env.favicon_href+'"/>').replaceAll('link[rel="shortcut icon"]');
rcmail.env.favicon_href = null;
}
}
// Basic notification: window.focus and favicon change
function newmail_notifier_basic()
{
var w = rcmail.is_framed() ? window.parent : window;
w.focus();
// we cannot simply change a href attribute, we must to replace the link element (at least in FF)
var link = $('<link rel="shortcut icon" href="plugins/newmail_notifier/favicon.ico"/>'),
oldlink = $('link[rel="shortcut icon"]', w.document);
rcmail.env.favicon_href = oldlink.attr('href');
link.replaceAll(oldlink);
}
// Sound notification
function newmail_notifier_sound()
{
var elem, src = 'plugins/newmail_notifier/sound.wav';
// HTML5
try {
elem = $('<audio src="' + src + '" />');
elem.get(0).play();
}
// old method
catch (e) {
elem = $('<embed id="sound" src="' + src + '" hidden=true autostart=true loop=false />');
elem.appendTo($('body'));
window.setTimeout("$('#sound').remove()", 5000);
}
}
-// 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;
}
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()
{
newmail_notifier_basic();
}
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

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jan 31, 5:43 AM (6 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
426162
Default Alt Text
(6 KB)

Event Timeline