From 29e6d9ae3358f34b38cbc70e430724215fcbe05f Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 13 Jul 2011 19:16:09 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 5e1c3fa09515ef226b59db74a98b650a9a33af6a Monotone-Revision: be4244b9d0a73537e2bb9b03b82c773250dc71f4 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-07-13T19:16:09 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ UI/WebServerResources/UIxAttendeesEditor.js | 18 ++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa939956e..4b4dbc590 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-07-13 Francis Lachapelle + * UI/WebServerResources/UIxAppointmentEditor.js (handleAllDay) + (_setDate): fixed errors when event lasts all-day. + * SoObjects/Mailer/SOGoMailFolder.m (-deleteUIDs:useTrashFolder:inContext:): the withTrash argument is now a pointer since the method can modify it when the current diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js index 705b6f04b..e3fc1aecd 100644 --- a/UI/WebServerResources/UIxAttendeesEditor.js +++ b/UI/WebServerResources/UIxAttendeesEditor.js @@ -20,15 +20,11 @@ var attendeesEditor = { }; function handleAllDay() { - window.timeWidgets['start']['hour'].value = dayStartHour; - window.timeWidgets['start']['minute'].value = 0; - window.timeWidgets['end']['hour'].value = dayEndHour; - window.timeWidgets['end']['minute'].value = 0; + window.timeWidgets['start']['time'].value = dayStartHour + ":00"; + window.timeWidgets['end']['time'].value = dayEndHour + ":00"; - $("startTime_time_hour").disabled = true; - $("startTime_time_minute").disabled = true; - $("endTime_time_hour").disabled = true; - $("endTime_time_minute").disabled = true; + $("startTime_time").disabled = true; + $("endTime_time").disabled = true; $("freeBusyTimeRange").addClassName("hidden"); } @@ -1724,8 +1720,10 @@ function getShadowEndDate() { function _setDate(which, newDate) { window.timeWidgets[which]['date'].setInputAsDate(newDate); - window.timeWidgets[which]['time'].value = newDate.getDisplayHoursString(); - window.timeWidgets[which]['time'].onChange(); // method from SOGoTimePicker + if (!isAllDay) { + window.timeWidgets[which]['time'].value = newDate.getDisplayHoursString(); + window.timeWidgets[which]['time'].onChange(); // method from SOGoTimePicker + } } function setStartDate(newStartDate) {