Branch 'roundcubemail-plugins-kolab-format2-horde5' - 2 commits - plugins/calendar plugins/tasklist

[Thomas Brüderli]

 plugins/calendar/calendar_ui.js |    9 +++++----
 plugins/tasklist/tasklist.js    |   10 ++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit dac9965e024fb4b3d6d88684cff12842c95890ef
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Apr 18 15:28:03 2013 +0200

    Improve fix for wrong alarm settings (#1764)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index d9743ea..caf6142 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -444,8 +444,9 @@ function rcube_calendar_ui(settings)
         if (typeof event.alarms == 'string')
           event.alarms = event.alarms.split(';');
         
-        for (var alarm, i=0; i < event.alarms.length; i++) {
-          alarm = String(event.alarms[i]).split(':');
+        var valarms = event.alarms || [''];
+        for (var alarm, i=0; i < valarms.length; i++) {
+          alarm = String(valarms[i]).split(':');
           if (!alarm[1] && alarm[0]) alarm[1] = 'DISPLAY';
           $('#eventedit select.edit-alarm-type').val(alarm[1]);
           
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 2fd5323..c3fe9db 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -985,8 +985,9 @@ function rcube_tasklist_ui(settings)
             if (typeof rec.alarms == 'string')
                 rec.alarms = rec.alarms.split(';');
 
-          for (var alarm, i=0; i < rec.alarms.length; i++) {
-              alarm = String(rec.alarms[i]).split(':');
+          var valarms = rec.alarms || [''];
+          for (var alarm, i=0; i < valarms.length; i++) {
+              alarm = String(valarms[i]).split(':');
               if (!alarm[1] && alarm[0]) alarm[1] = 'DISPLAY';
               $('#taskedit select.edit-alarm-type').val(alarm[1]);
 


commit a83276740b6cd84cad321b4334e1d12662fb48d1
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Apr 18 15:13:00 2013 +0200

    Don't apply default alarm settings when editing an object that has no alarm set (#1764)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 1db870a..d9743ea 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -44,7 +44,7 @@ function rcube_calendar_ui(settings)
     var client_timezone = new Date().getTimezoneOffset();
     var day_clicked = day_clicked_ts = 0;
     var ignore_click = false;
-    var event_defaults = { free_busy:'busy' };
+    var event_defaults = { free_busy:'busy', alarms:'' };
     var event_attendees = [];
     var attendees_list;
     var freebusy_ui = { workinhoursonly:false, needsupdate:false };
@@ -440,7 +440,7 @@ function rcube_calendar_ui(settings)
       
       // set alarm(s)
       // TODO: support multiple alarm entries
-      if (event.alarms) {
+      if (event.alarms || action != 'new') {
         if (typeof event.alarms == 'string')
           event.alarms = event.alarms.split(';');
         
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index ffb38d6..2fd5323 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -940,7 +940,8 @@ function rcube_tasklist_ui(settings)
         if (!list.editable || (action == 'edit' && (!rec || rec.readonly)))
             return false;
 
-        me.selected_task = $.extend({}, rec);  // clone task object
+        me.selected_task = $.extend({ alarms:'' }, rec);  // clone task object
+        rec =  me.selected_task;
 
         // assign temporary id
         if (!me.selected_task.id)
@@ -980,7 +981,7 @@ function rcube_tasklist_ui(settings)
         });
 
         // set alarm(s)
-        if (rec.alarms) {
+        if (rec.alarms || action != 'new') {
             if (typeof rec.alarms == 'string')
                 rec.alarms = rec.alarms.split(';');