drip-public/iview
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Date utils improvements and specs

Browse source 
Date utility functions `prevMonth` and `nextMonth` change the source
date when using `src.set[Date|Month|FullYear]()`. This change creates a
copy of the date at entrance of function so we have a pure function.

Made some code refactor and added specs for these functions.
This commit is contained in:
Sergio Crisostomo 2017-08-24 08:21:50 +02:00
parent 2baba209b7
commit c91c30ccbb
2 changed files with 82 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/components/date-picker/util.js
View file

@ -17,19 +17,7 @@ export const parseDate = function(string, format) {
};
export const getDayCountOfMonth = function(year, month) {
if (month === 3 || month === 5 || month === 8 || month === 10) {
return 30;
}
if (month === 1) {
if (year % 4 === 0 && year % 100 !== 0 || year % 400 === 0) {
return 29;
} else {
return 28;
}
}
return 31;
return new Date(year, month + 1, 0).getDate();
};
export const getFirstDayOfMonth = function(date) {
@ -38,48 +26,30 @@ export const getFirstDayOfMonth = function(date) {
return temp.getDay();
};
export const prevMonth = function(src) {
const year = src.getFullYear();
const month = src.getMonth();
const date = src.getDate();
const newYear = month === 0 ? year - 1 : year;
const newMonth = month === 0 ? 11 : month - 1;
const newMonthDayCount = getDayCountOfMonth(newYear, newMonth);
if (newMonthDayCount < date) {
src.setDate(newMonthDayCount);
export const siblingMonth = function(src, diff) {
const temp = new Date(src); // lets copy it so we don't change the original
const newMonth = temp.getMonth() + diff;
const newMonthDayCount = getDayCountOfMonth(temp.getFullYear(), newMonth);
if (newMonthDayCount < temp.getDate()) {
temp.setDate(newMonthDayCount);
}
temp.setMonth(newMonth);
src.setMonth(newMonth);
src.setFullYear(newYear);
return temp;
};
return new Date(src.getTime());
export const prevMonth = function(src) {
return siblingMonth(src, -1);
};
export const nextMonth = function(src) {
const year = src.getFullYear();
const month = src.getMonth();
const date = src.getDate();
const newYear = month === 11 ? year + 1 : year;
const newMonth = month === 11 ? 0 : month + 1;
const newMonthDayCount = getDayCountOfMonth(newYear, newMonth);
if (newMonthDayCount < date) {
src.setDate(newMonthDayCount);
}
src.setMonth(newMonth);
src.setFullYear(newYear);
return new Date(src.getTime());
return siblingMonth(src, 1);
};
export const initTimeDate = function () {
export const initTimeDate = function() {
const date = new Date();
date.setHours(0);
date.setMinutes(0);
date.setSeconds(0);
return date;
};
};