Request #6232: Show alarm notifications in DIMP.

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index e84db88..6b6fde0 100644 (file)
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -2,6 +2,7 @@
 v5.0-git
 --------
 
+[mms] Display alarm notifications in DIMP (Request #6232).
 [mms] Auto-determine charset for text attachments (Bug #8858).
 [mms] Remove IE 6 (and below) and Safari 2 (and below) support for DIMP.
 [mms] Add chance to switch between forward options on compose page when using

diff --git a/imp/js/DimpCore.js b/imp/js/DimpCore.js
index c6c5be0..9fdb6e7 100644 (file)
--- a/imp/js/DimpCore.js
+++ b/imp/js/DimpCore.js
@@ -12,6 +12,7 @@ var DimpCore = {
     // Vars used and defaulting to null/false:
     //   DMenu, Growler, inAjaxCallback, is_init, is_logout
     //   onDoActionComplete
+    alarms: {},
     growler_log: true,
     server_error: 0,
 
@@ -205,28 +206,41 @@ var DimpCore = {
         }
 
         msgs.find(function(m) {
-            var log = 0;
-
             switch (m.type) {
             case 'horde.ajaxtimeout':
                 this.logout(m.message);
                 return true;
 
+            case 'horde.alarm':
+                if (!this.alarms[m.alarm.id]) {
+                    this.Growler.growl(m.alarm.title + ': ' + m.alarm.text, {
+                        className: 'horde-alarm',
+                        sticky: 1,
+                        log: 1
+                    });
+                    this.alarms[m.alarm.id] = 1;
+                }
+                break;
+
             case 'horde.error':
             case 'horde.message':
             case 'horde.success':
             case 'horde.warning':
-                log = 1;
-                // Fall through to below case.
+                this.Growler.growl(m.message, {
+                    className: m.type.replace('.', '-'),
+                    life: (m.type == 'horde.error' ? 12 : 8),
+                    log: 1
+                });
+                break;
 
             case 'imp.reply':
             case 'imp.forward':
             case 'imp.redirect':
                 this.Growler.growl(m.message, {
                     className: m.type.replace('.', '-'),
-                    life: (m.type == 'horde.error' ? 12 : 8),
-                    log: log
+                    life: 8
                 });
+                break;
             }
         }, this);
     },