extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-18 11:21:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure we don't hit undefined last_format

Browse Source
This commit is contained in:
nathangray 2016-07-15 08:04:59 -06:00
parent c9f542e766
commit 1a0ff85355
1 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
calendar/js/app.js
View File

@ -3107,67 +3107,67 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
} }
for (var i = 0; i < 5; i += 2) for (var i = 0; i < 5; i += 2)
{ {
switch(datefmt[i]) switch(datefmt[i])
{ {
case 'd': case 'd':
range += first.getUTCDate()+ (datefmt[1] == '.' ? '.' : ''); range += first.getUTCDate()+ (datefmt[1] == '.' ? '.' : '');
if (last && (first.getUTCMonth() != last.getUTCMonth() || first.getUTCFullYear() != last.getUTCFullYear())) if (last && (first.getUTCMonth() != last.getUTCMonth() || first.getUTCFullYear() != last.getUTCFullYear()))
{ {
if (!month_before_day) if (!month_before_day)
{ {
range += jQuery.datepicker.formatDate('MM',first_format); range += jQuery.datepicker.formatDate('MM',first_format);
} }
if (first.getFullYear() != last.getFullYear() && datefmt[0] != 'Y') if (first.getFullYear() != last.getFullYear() && datefmt[0] != 'Y')
{ {
range += (datefmt[0] != 'd' ? ', ' : ' ') + first.getFullYear(); range += (datefmt[0] != 'd' ? ', ' : ' ') + first.getFullYear();
} }
if (display_time) if (display_time)
{ {
range += ' '+jQuery.datepicker.formatDate(dateTimeFormat(timefmt),first_format); range += ' '+jQuery.datepicker.formatDate(dateTimeFormat(timefmt),first_format);
} }
if (!last) if (!last)
{ {
return range; return range;
} }
range += ' - '; range += ' - ';
if (first.getFullYear() != last.getFullYear() && datefmt[0] == 'Y') if (first.getFullYear() != last.getFullYear() && datefmt[0] == 'Y')
{ {
range += last.getUTCFullYear() + ', '; range += last.getUTCFullYear() + ', ';
} }
if (month_before_day) if (month_before_day)
{ {
range += jQuery.datepicker.formatDate('MM',last_format); range += jQuery.datepicker.formatDate('MM',last_format);
} }
} }
else else if (last)
{ {
if (display_time) if (display_time)
{ {
range += ' '+jQuery.datepicker.formatDate(dateTimeFormat(timefmt),last_format); range += ' '+jQuery.datepicker.formatDate(dateTimeFormat(timefmt),last_format);
} }
if(last) if(last)
{ {
range += ' - '; range += ' - ';
} }
} }
if(last) if(last)
{ {
range += ' ' + last.getUTCDate() + (datefmt[1] == '.' ? '.' : ''); range += ' ' + last.getUTCDate() + (datefmt[1] == '.' ? '.' : '');
} }
break; break;
case 'm': case 'm':
case 'M': case 'M':
range += ' '+jQuery.datepicker.formatDate('MM',month_before_day ? first_format : last_format) + ' '; range += ' '+jQuery.datepicker.formatDate('MM',month_before_day || !last ? first_format : last_format) + ' ';
break; break;
case 'Y': case 'Y':
if (datefmt[0] != 'm') if (datefmt[0] != 'm')
{ {
range += ' ' + (datefmt[0] == 'Y' ? first.getUTCFullYear()+(datefmt[2] == 'd' ? ', ' : ' ') : last.getUTCFullYear()+' '); range += ' ' + (datefmt[0] == 'Y' ? first.getUTCFullYear()+(datefmt[2] == 'd' ? ', ' : ' ') : last.getUTCFullYear()+' ');
} }
break; break;
} }
} }
if (display_time && last) if (display_time && last)
{ {