Branch 'roundcubemail-plugins-kolab-0.9' - plugins/tasklist

Thomas Brüderli bruederli at kolabsys.com
Fri May 31 18:13:46 CEST 2013


 plugins/tasklist/tasklist.js |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 85ed59aad3aa32f9c9fd79b588a48198b3486ec0
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Fri May 31 18:07:16 2013 +0200

    Only temporarily split alarms string into array (#1905)

diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 530bb25..84215b0 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -1008,10 +1008,7 @@ function rcube_tasklist_ui(settings)
 
         // set alarm(s)
         if (rec.alarms || action != 'new') {
-            if (typeof rec.alarms == 'string')
-                rec.alarms = rec.alarms.split(';');
-
-          var valarms = rec.alarms || [''];
+          var valarms = (typeof rec.alarms == 'string' ? rec.alarms.split(';') : rec.alarms) || [''];
           for (var alarm, i=0; i < valarms.length; i++) {
               alarm = String(valarms[i]).split(':');
               if (!alarm[1] && alarm[0]) alarm[1] = 'DISPLAY';





More information about the commits mailing list