gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use formatted datetime value in Redux.

Browse Source
This commit is contained in:
Caleb 2018-03-02 16:27:52 -07:00 committed by Shawn Erquhart
parent c4222895a5
commit b7fcb8b3d9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/EditorWidgets/Date/DateControl.js
View File

@ -21,8 +21,8 @@ export default class DateControl extends React.Component {
}; };
componentDidMount() { componentDidMount() {
const { value, field, onChange } = this.props; const { includeTime, value, field, onChange } = this.props;
this.format = field.get('format'); this.format = field.get('format') || (includeTime ? DEFAULT_DATETIME_FORMAT : DEFAULT_DATE_FORMAT);
/** /**
* Set the current date as default value if no default value is provided. An * Set the current date as default value if no default value is provided. An
@ -45,7 +45,7 @@ export default class DateControl extends React.Component {
render() { render() {
const { includeTime, value, classNameWrapper, setActiveStyle, setInactiveStyle } = this.props; const { includeTime, value, classNameWrapper, setActiveStyle, setInactiveStyle } = this.props;
const format = this.format || (includeTime ? DEFAULT_DATETIME_FORMAT : DEFAULT_DATE_FORMAT); const format = this.format;
return ( return (
<DateTime <DateTime
timeFormat={!!includeTime} timeFormat={!!includeTime}