Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix time parsing

Browse source
This commit is contained in:
Thomas 2011-07-19 17:50:27 +02:00
parent 5f445239c3
commit b5a5e7eacd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/calendar/calendar_ui.js
View file

@ -96,12 +96,12 @@ function rcube_calendar_ui(settings)
// we use the utility function from datepicker to parse dates // we use the utility function from datepicker to parse dates
var date = date ? $.datepicker.parseDate(datepicker_settings.dateFormat, date, datepicker_settings) : new Date(); var date = date ? $.datepicker.parseDate(datepicker_settings.dateFormat, date, datepicker_settings) : new Date();
var time_arr = time.replace(/\s*[ap]m?/i, '').replace(/0([0-9])/g, '$1').split(/[:.]/); var time_arr = time.replace(/\s*[ap][.m]*/i, '').replace(/0([0-9])/g, '$1').split(/[:.]/);
if (!isNaN(time_arr[0])) { if (!isNaN(time_arr[0])) {
date.setHours(time_arr[0]); date.setHours(time_arr[0]);
if (time.match(/pm?/i) && date.getHours() < 12) if (time.match(/p[.m]*/i) && date.getHours() < 12)
date.setHours(parseInt(time_arr[0]) + 12); date.setHours(parseInt(time_arr[0]) + 12);
else if (date.getHours() == 12) else if (time.match(/a[.m]*/i) && date.getHours() == 12)
date.setHours(0); date.setHours(0);
} }
if (!isNaN(time_arr[1])) if (!isNaN(time_arr[1]))