Merge pull request #87 from rimas-kudelis/master

Merge pull request #87 from rimas-kudelis: additions to newmail_notifier

4 files changed, 84 insertions, 26 deletions

diff --git a/plugins/newmail_notifier/newmail_notifier.js b/plugins/newmail_notifier/newmail_notifier.js
index 7c9b55ded..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)
         $('<link rel="shortcut icon" href="'+rcmail.env.favicon_href+'"/>').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
@@ -69,44 +83,79 @@ 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;
 }
 
 function newmail_notifier_test_desktop()
 {
-    var dn = window.webkitNotifications,
-        txt = rcmail.gettext('testbody', 'newmail_notifier');
+    var 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) {
+        var dn = window.webkitNotifications;
+        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 +167,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
+        });
+}
diff --git a/plugins/newmail_notifier/overlay.ico b/plugins/newmail_notifier/overlay.ico
new file mode 100644
index 000000000..17eb61a05
--- /dev/null
+++ b/plugins/newmail_notifier/overlay.ico
diff --git a/skins/classic/images/favicon.ico b/skins/classic/images/favicon.ico
index b3bd18c12..9ef2f3b9e 100644
--- a/skins/classic/images/favicon.ico
+++ b/skins/classic/images/favicon.ico
diff --git a/skins/larry/images/favicon.ico b/skins/larry/images/favicon.ico
index b3bd18c12..9ef2f3b9e 100644
--- a/skins/larry/images/favicon.ico
+++ b/skins/larry/images/favicon.ico