aboutsummaryrefslogtreecommitdiff
path: root/radicale_infcloud/web/data_process.js
diff options
context:
space:
mode:
Diffstat (limited to 'radicale_infcloud/web/data_process.js')
-rw-r--r--radicale_infcloud/web/data_process.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/radicale_infcloud/web/data_process.js b/radicale_infcloud/web/data_process.js
index 69f81d4..d0cf40e 100644
--- a/radicale_infcloud/web/data_process.js
+++ b/radicale_infcloud/web/data_process.js
@@ -165,6 +165,7 @@ function setAlertTimeouts(isTodo, alertTime, dateStart, dateEnd, params, firstIn
if(aTime!==''&&aTime>now)
{
var delay=aTime-now;
+ var this_color = "";
if(maxAlarmValue<delay)
delay=maxAlarmValue;
if(isTodo)
@@ -173,7 +174,13 @@ function setAlertTimeouts(isTodo, alertTime, dateStart, dateEnd, params, firstIn
}, delay,startTime);
else
alertTimeOut[alertTimeOut.length]=setTimeout(function(startTime){
- showAlertEvents(uid, (aTime-now), {start:new Date(startTime.getTime()), allDay:params.allDay, title:params.title});
+ var collections=globalResourceCalDAVList.collections;
+ for(var i=0;i<collections.length;i++) {
+ if(uid.startsWith(collections[i].uid)) {
+ this_color = collections[i].ecolor;
+ }
+ }
+ showAlertEvents(uid, (aTime-now), {start:new Date(startTime.getTime()), allDay:params.allDay, title:params.title, color:this_color});
}, delay,startTime);
}
}
bgstack15