javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-23 22:17:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(all): strict boolean conditions

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-08-31 18:59:09 +02:00
parent f383ebdf13
commit ba2230510e
96 changed files with 990 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
core/src/components/datetime/datetime-util.ts
View File

@ -1,5 +1,5 @@
export function renderDatetime(template: string, value: DatetimeData, locale: LocaleData) {
export function renderDatetime(template: string, value: DatetimeData | undefined, locale: LocaleData): string | undefined {
if (value === undefined) {
return undefined;
}
@ -32,8 +32,7 @@ export function renderDatetime(template: string, value: DatetimeData, locale: Lo
return template;
}
export function renderTextFormat(format: string, value: any, date: DatetimeData | null, locale: LocaleData): string {
export function renderTextFormat(format: string, value: any, date: DatetimeData | undefined, locale: LocaleData): string {
if ((format === FORMAT_DDDD || format === FORMAT_DDD)) {
try {
value = (new Date(date!.year!, date!.month! - 1, date!.day)).getDay();
@ -52,11 +51,15 @@ export function renderTextFormat(format: string, value: any, date: DatetimeData
}
if (format === FORMAT_A) {
return date && date.hour ? date.hour < 12 ? 'AM' : 'PM' : value ? value.toUpperCase() : '';
return date !== undefined && date.hour !== undefined
? (date.hour < 12 ? 'AM' : 'PM')
: value ? value.toUpperCase() : '';
}
if (format === FORMAT_a) {
return date && date.hour ? date.hour < 12 ? 'am' : 'pm' : value ? value : '';
return date !== undefined && date.hour !== undefined
? (date.hour < 12 ? 'am' : 'pm')
: value || '';
}
if (value == null) {
@ -101,7 +104,7 @@ export function dateValueRange(format: string, min: DatetimeData, max: DatetimeD
if (format === FORMAT_YYYY || format === FORMAT_YY) {
// year
if (!max.year || !min.year) {
if (max.year === undefined || min.year === undefined) {
throw new Error('min and max year is undefined');
}
@ -156,10 +159,7 @@ export function dateSortValue(year: number | undefined, month: number | undefine
}
export function dateDataSortValue(data: DatetimeData): number {
if (data) {
return dateSortValue(data.year, data.month, data.day, data.hour, data.minute);
}
return -1;
return dateSortValue(data.year, data.month, data.day, data.hour, data.minute);
}
export function daysInMonth(month: number, year: number): number {
@ -173,12 +173,12 @@ export function isLeapYear(year: number): boolean {
const ISO_8601_REGEXP = /^(\d{4}|[+\-]\d{6})(?:-(\d{2})(?:-(\d{2}))?)?(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d{3}))?)?(?:(Z)|([+\-])(\d{2})(?::(\d{2}))?)?)?$/;
const TIME_REGEXP = /^((\d{2}):(\d{2})(?::(\d{2})(?:\.(\d{3}))?)?(?:(Z)|([+\-])(\d{2})(?::(\d{2}))?)?)?$/;
export function parseDate(val: string | undefined): DatetimeData | null {
export function parseDate(val: string | undefined | null): DatetimeData | undefined {
// manually parse IS0 cuz Date.parse cannot be trusted
// ISO 8601 format: 1994-12-15T13:47:20Z
let parse: any[] | null = null;
if (val && val !== '') {
if (val != null) {
// try parsing for just time first, HH:MM
parse = TIME_REGEXP.exec(val);
if (parse) {
@ -192,14 +192,14 @@ export function parseDate(val: string | undefined): DatetimeData | null {
}
}
if (parse == null) {
if (parse === null) {
// wasn't able to parse the ISO datetime
return null;
return undefined;
}
// ensure all the parse values exist with at least 0
for (let i = 1; i < 8; i++) {
parse[i] = (parse[i] !== undefined ? parseInt(parse[i], 10) : null);
parse[i] = parse[i] !== undefined ? parseInt(parse[i], 10) : undefined;
}
let tzOffset = 0;
@ -255,7 +255,7 @@ export function updateDate(existingData: DatetimeData, newData: any): boolean {
// merge new values from the picker's selection
// to the existing DatetimeData values
for (const key of Object.keys(newData)) {
existingData[key] = newData[key].value;
(existingData as any)[key] = newData[key].value;
}
return true;
}
@ -317,65 +317,62 @@ export function getValueFromFormat(date: DatetimeData, format: string) {
return (date as any)[convertFormatToKey(format)!];
}
export function convertFormatToKey(format: string): string | null {
export function convertFormatToKey(format: string): string | undefined {
for (const k in FORMAT_KEYS) {
if (FORMAT_KEYS[k].f === format) {
return FORMAT_KEYS[k].k;
}
}
return null;
return undefined;
}
export function convertDataToISO(data: DatetimeData): string {
// https://www.w3.org/TR/NOTE-datetime
let rtn = '';
if (data.year !== undefined) {
// YYYY
rtn = fourDigit(data.year);
if (data) {
if (data.year) {
// YYYY
rtn = fourDigit(data.year);
if (data.month !== undefined) {
// YYYY-MM
rtn += '-' + twoDigit(data.month);
if (data.month) {
// YYYY-MM
rtn += '-' + twoDigit(data.month);
if (data.day !== undefined) {
// YYYY-MM-DD
rtn += '-' + twoDigit(data.day);
if (data.day) {
// YYYY-MM-DD
rtn += '-' + twoDigit(data.day);
if (data.hour !== undefined) {
// YYYY-MM-DDTHH:mm:SS
rtn += `T${twoDigit(data.hour)}:${twoDigit(data.minute)}:${twoDigit(data.second)}`;
if (data.hour) {
// YYYY-MM-DDTHH:mm:SS
rtn += `T${twoDigit(data.hour)}:${twoDigit(data.minute)}:${twoDigit(data.second)}`;
if (data.millisecond! > 0) {
// YYYY-MM-DDTHH:mm:SS.SSS
rtn += '.' + threeDigit(data.millisecond);
}
if (data.millisecond! > 0) {
// YYYY-MM-DDTHH:mm:SS.SSS
rtn += '.' + threeDigit(data.millisecond);
}
if (data.tzOffset === undefined) {
// YYYY-MM-DDTHH:mm:SSZ
rtn += 'Z';
if (data.tzOffset == null || data.tzOffset === 0) {
// YYYY-MM-DDTHH:mm:SSZ
rtn += 'Z';
} else {
// YYYY-MM-DDTHH:mm:SS+/-HH:mm
rtn += (data.tzOffset > 0 ? '+' : '-') + twoDigit(Math.floor(data.tzOffset / 60)) + ':' + twoDigit(data.tzOffset % 60);
}
} else {
// YYYY-MM-DDTHH:mm:SS+/-HH:mm
rtn += (data.tzOffset > 0 ? '+' : '-') + twoDigit(Math.floor(data.tzOffset / 60)) + ':' + twoDigit(data.tzOffset % 60);
}
}
}
}
} else if (data.hour) {
// HH:mm
rtn = twoDigit(data.hour) + ':' + twoDigit(data.minute);
} else if (data.hour !== undefined) {
// HH:mm
rtn = twoDigit(data.hour) + ':' + twoDigit(data.minute);
if (data.second) {
// HH:mm:SS
rtn += ':' + twoDigit(data.second);
if (data.second !== undefined) {
// HH:mm:SS
rtn += ':' + twoDigit(data.second);
if (data.millisecond) {
// HH:mm:SS.SSS
rtn += '.' + threeDigit(data.millisecond);
}
if (data.millisecond !== undefined) {
// HH:mm:SS.SSS
rtn += '.' + threeDigit(data.millisecond);
}
}
}
@ -388,7 +385,7 @@ export function convertDataToISO(data: DatetimeData): string {
* an array of strings, and clean up any user input
*/
export function convertToArrayOfStrings(input: string | string[] | undefined | null, type: string): string[] | undefined {
if (!input) {
if (input == null) {
return undefined;
}
@ -404,7 +401,7 @@ export function convertToArrayOfStrings(input: string | string[] | undefined | n
values = input.map(val => val.toString().trim());
}
if (!values || !values.length) {
if (values === undefined || values.length === 0) {
console.warn(`Invalid "${type}Names". Must be an array of strings, or a comma separated string.`);
}
@ -432,7 +429,7 @@ export function convertToArrayOfNumbers(input: any[] | string | number, type: st
values = [input];
}
if (!values || !values.length) {
if (values.length === 0) {
console.warn(`Invalid "${type}Values". Must be an array of numbers, or a comma separated string of numbers.`);
}
@ -440,19 +437,18 @@ export function convertToArrayOfNumbers(input: any[] | string | number, type: st
}
function twoDigit(val: number | undefined): string {
return ('0' + (val ? Math.abs(val) : '0')).slice(-2);
return ('0' + (val !== undefined ? Math.abs(val) : '0')).slice(-2);
}
function threeDigit(val: number | undefined): string {
return ('00' + (val ? Math.abs(val) : '0')).slice(-3);
return ('00' + (val !== undefined ? Math.abs(val) : '0')).slice(-3);
}
function fourDigit(val: number | undefined): string {
return ('000' + (val ? Math.abs(val) : '0')).slice(-4);
return ('000' + (val !== undefined ? Math.abs(val) : '0')).slice(-4);
}
export interface DatetimeData {
[key: string]: any;
year?: number;
month?: number;
day?: number;