|
802 | 802 | formattedDate: function (format, date) {
|
803 | 803 | return module.helper.dateFormat(format || formatter[settings.type], date || module.get.date());
|
804 | 804 | },
|
805 |
| - date: function () { |
806 |
| - return module.helper.sanitiseDate($module.data(metadata.date)) || null; |
| 805 | + date: function (format) { |
| 806 | + return module.helper.dateObjectOrFormatted(format, $module.data(metadata.date)); |
807 | 807 | },
|
808 | 808 | inputDate: function () {
|
809 | 809 | return $input.val();
|
810 | 810 | },
|
811 |
| - focusDate: function () { |
812 |
| - return $module.data(metadata.focusDate) || null; |
| 811 | + focusDate: function (format) { |
| 812 | + return module.helper.dateObjectOrFormatted(format, $module.data(metadata.focusDate)); |
813 | 813 | },
|
814 |
| - startDate: function () { |
| 814 | + startDate: function (format) { |
815 | 815 | var startModule = module.get.calendarModule(settings.startCalendar);
|
816 | 816 |
|
817 |
| - return (startModule ? startModule.get.date() : $module.data(metadata.startDate)) || null; |
| 817 | + if (startModule) { |
| 818 | + return startModule.get.date(format); |
| 819 | + } |
| 820 | + |
| 821 | + return module.helper.dateObjectOrFormatted(format, $module.data(metadata.startDate)); |
818 | 822 | },
|
819 |
| - endDate: function () { |
| 823 | + endDate: function (format) { |
820 | 824 | var endModule = module.get.calendarModule(settings.endCalendar);
|
821 | 825 |
|
822 |
| - return (endModule ? endModule.get.date() : $module.data(metadata.endDate)) || null; |
| 826 | + if (endModule) { |
| 827 | + return endModule.get.date(format); |
| 828 | + } |
| 829 | + |
| 830 | + return module.helper.dateObjectOrFormatted(format, $module.data(metadata.endDate)); |
823 | 831 | },
|
824 | 832 | minDate: function () {
|
825 | 833 | return $module.data(metadata.minDate) || null;
|
|
1135 | 1143 | return match.slice(1, -1);
|
1136 | 1144 | });
|
1137 | 1145 | },
|
| 1146 | + dateObjectOrFormatted: function (format, date) { |
| 1147 | + format = format || ''; |
| 1148 | + date = module.helper.sanitiseDate(date) || null; |
| 1149 | + |
| 1150 | + if (!date) { |
| 1151 | + return null; |
| 1152 | + } |
| 1153 | + |
| 1154 | + if (format === '') { |
| 1155 | + return date; |
| 1156 | + } |
| 1157 | + |
| 1158 | + return module.helper.dateFormat(format, date); |
| 1159 | + }, |
1138 | 1160 | isDisabled: function (date, mode) {
|
1139 | 1161 | return (mode === 'day' || mode === 'month' || mode === 'year' || mode === 'hour') && (((mode === 'day' && settings.disabledDaysOfWeek.indexOf(date.getDay()) !== -1) || settings.disabledDates.some(function (d) {
|
1140 | 1162 | var blocked = false;
|
|
0 commit comments