mirror of
https://github.com/harttle/liquidjs.git
synced 2026-09-16 12:50:38 -07:00
+3
-1
@@ -45,7 +45,9 @@ function parseDate (v: string | Date, opts: NormalizedFullOptions, timezoneOffse
|
|||||||
const defaultTimezoneOffset = timezoneOffset ?? opts.timezoneOffset
|
const defaultTimezoneOffset = timezoneOffset ?? opts.timezoneOffset
|
||||||
const locale = opts.locale
|
const locale = opts.locale
|
||||||
v = toValue(v)
|
v = toValue(v)
|
||||||
if (v === 'now' || v === 'today') {
|
if (isNil(v)) {
|
||||||
|
return undefined
|
||||||
|
} else if (v === 'now' || v === 'today') {
|
||||||
date = new LiquidDate(Date.now(), locale, defaultTimezoneOffset)
|
date = new LiquidDate(Date.now(), locale, defaultTimezoneOffset)
|
||||||
} else if (isNumber(v)) {
|
} else if (isNumber(v)) {
|
||||||
date = new LiquidDate(v * 1000, locale, defaultTimezoneOffset)
|
date = new LiquidDate(v * 1000, locale, defaultTimezoneOffset)
|
||||||
|
|||||||
@@ -21,8 +21,12 @@ describe('filters/date', function () {
|
|||||||
const time = String(new Date('2017-03-07T12:00:00').getTime() / 1000)
|
const time = String(new Date('2017-03-07T12:00:00').getTime() / 1000)
|
||||||
return test('{{ time | date: "%Y-%m-%dT%H:%M:%S" }}', { time }, '2017-03-07T12:00:00')
|
return test('{{ time | date: "%Y-%m-%dT%H:%M:%S" }}', { time }, '2017-03-07T12:00:00')
|
||||||
})
|
})
|
||||||
it('should treat nil as 0', () => {
|
it('should treat null as invalid', () => {
|
||||||
expect(liquid.parseAndRenderSync('{{ nil | date: "%Y-%m-%dT%H:%M:%S", "Asia/Shanghai" }}')).toEqual('1970-01-01T08:00:00')
|
const time = null
|
||||||
|
return test('{{ time | date: "%Y-%m-%dT%H:%M:%S" }}', { time }, '')
|
||||||
|
})
|
||||||
|
it('should treat nil as invalid', () => {
|
||||||
|
expect(liquid.parseAndRenderSync('{{ nil | date: "%Y-%m-%dT%H:%M:%S", "Asia/Shanghai" }}')).toEqual('')
|
||||||
})
|
})
|
||||||
it('should treat undefined as invalid', () => {
|
it('should treat undefined as invalid', () => {
|
||||||
expect(liquid.parseAndRenderSync('{{ num | date: "%Y-%m-%dT%H:%M:%S", "Asia/Shanghai" }}', { num: undefined })).toEqual('')
|
expect(liquid.parseAndRenderSync('{{ num | date: "%Y-%m-%dT%H:%M:%S", "Asia/Shanghai" }}', { num: undefined })).toEqual('')
|
||||||
|
|||||||
Reference in New Issue
Block a user