react-timestamp
Advanced tools
Comparing version
39
index.js
@@ -104,5 +104,9 @@ import React from 'react'; | ||
_formatDate (date) { | ||
if (date == '') return 'never'; | ||
_parseDate (date) { | ||
if (date === '' || date === false || date === null) return false; | ||
if (typeof date === "number") { | ||
date = new Date(date * 1000); | ||
} | ||
if (date.toJSON) { | ||
@@ -116,17 +120,28 @@ date = date.toJSON(); | ||
for (var i in t) { | ||
if (t[i] !== '' && isNaN(parseInt(t[i], 10))) return 'never'; | ||
if (t[i] !== '' && isNaN(parseInt(t[i], 10))) return false; | ||
} | ||
var time = new Date("Sun Jan 01 00:00:00 UTC 2012"); | ||
var d = new Date("Sun Jan 01 00:00:00 UTC 2012"); | ||
time.setUTCFullYear(t[0]); | ||
time.setUTCMonth(t[1] - 1); | ||
time.setUTCDate(t[2]); | ||
time.setUTCHours(t[3]); | ||
time.setUTCMinutes(t[4]); | ||
time.setUTCSeconds(t[5]); | ||
d.setUTCFullYear(t[0]); | ||
d.setUTCMonth(t[1] - 1); | ||
d.setUTCDate(t[2]); | ||
d.setUTCHours(t[3]); | ||
d.setUTCMinutes(t[4]); | ||
d.setUTCSeconds(t[5]); | ||
return d; | ||
} | ||
_formatDate (date) { | ||
var d = this._parseDate(date); | ||
if (d === false) { | ||
return 'never'; | ||
} | ||
if (this.props.format == 'ago') { | ||
return this._timeAgoInWords(time); | ||
return this._timeAgoInWords(d); | ||
} else { | ||
return this._prettyTime(time); | ||
return this._prettyTime(d); | ||
} | ||
@@ -133,0 +148,0 @@ } |
{ | ||
"name": "react-timestamp", | ||
"version": "1.0.0", | ||
"version": "1.0.1", | ||
"description": "A React component for displaying a datetime in the local timezone", | ||
@@ -5,0 +5,0 @@ "scripts": { |
5832
5.16%128
8.47%