Skip to content
This repository was archived by the owner on Nov 16, 2018. It is now read-only.

use format and inputFormat #3

Merged
merged 1 commit into from
Nov 26, 2014
Merged

use format and inputFormat #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/DateTimeField.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ DateTimeField = React.createClass({
});
},
onChange: function(event) {
if (moment(event.target.value, "MM/DD/YY H:mm A").isValid()) {
if (moment(event.target.value, this.props.format).isValid()) {
this.setState({
selectedDate: moment(event.target.value, "MM/DD/YY H:mm A"),
inputValue: moment(event.target.value, "MM/DD/YY H:mm A").format("MM/DD/YY H:mm A")
selectedDate: moment(event.target.value, this.props.format),
inputValue: moment(event.target.value, this.props.format).format(this.props.inputFormat)
});
} else {
this.setState({
Expand All @@ -69,7 +69,7 @@ DateTimeField = React.createClass({
this.closePicker();
this.props.onChange(this.state.selectedDate.format(this.props.format));
return this.setState({
inputValue: this.state.selectedDate.format("MM/DD/YY H:mm A")
inputValue: this.state.selectedDate.format(this.props.inputFormat)
});
});
},
Expand All @@ -80,7 +80,7 @@ DateTimeField = React.createClass({
this.closePicker();
this.props.onChange(this.state.selectedDate.format(this.props.format));
return this.setState({
inputValue: this.state.selectedDate.format("MM/DD/YY H:mm A")
inputValue: this.state.selectedDate.format(this.props.inputFormat)
});
});
},
Expand All @@ -91,7 +91,7 @@ DateTimeField = React.createClass({
this.closePicker();
this.props.onChange(this.state.selectedDate.format(this.props.format));
return this.setState({
inputValue: this.state.selectedDate.format("MM/DD/YY H:mm A")
inputValue: this.state.selectedDate.format(this.props.inputFormat)
});
});
},
Expand Down Expand Up @@ -273,7 +273,7 @@ DateTimeField = React.createClass({
togglePeriod={this.togglePeriod}
/>
<div className="input-group date" ref="datetimepicker">
<input type="text" className="form-control" onChange={this.onChange} value={this.state.selectedDate.format("MM/DD/YY h:mm A")} />
<input type="text" className="form-control" onChange={this.onChange} value={this.state.selectedDate.format(this.props.inputFormat)} />
<span className="input-group-addon" onClick={this.onClick} onBlur={this.onBlur} ref="dtpbutton"><Glyphicon glyph="calendar" /></span>
</div>
</div>
Expand Down
14 changes: 7 additions & 7 deletions src/coffee/DateTimeField.jsx.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ DateTimeField = React.createClass(

# to improve with detection only onBlur
onChange: (event) ->
if moment(event.target.value, "MM/DD/YY H:mm A").isValid()
if moment(event.target.value, @props.format).isValid()
@setState
selectedDate: moment(event.target.value, "MM/DD/YY H:mm A")
inputValue: moment(event.target.value, "MM/DD/YY H:mm A").format("MM/DD/YY H:mm A")
selectedDate: moment(event.target.value, @props.format)
inputValue: moment(event.target.value, @props.format).format(@props.inputFormat)
else
@setState inputValue: event.target.value
console.log "This is not a valid date"
Expand All @@ -54,19 +54,19 @@ DateTimeField = React.createClass(
@setState selectedDate: @state.viewDate.clone().date(parseInt(e.target.innerHTML)).hour(@state.selectedDate.hours()).minute(@state.selectedDate.minutes()), ->
@closePicker()
@props.onChange(@state.selectedDate.format(@props.format))
@setState inputValue: @state.selectedDate.format("MM/DD/YY H:mm A")
@setState inputValue: @state.selectedDate.format(@props.inputFormat)

setSelectedHour: (e) ->
@setState selectedDate: @state.selectedDate.clone().hour(parseInt(e.target.innerHTML)).minute(@state.selectedDate.minutes()), ->
@closePicker()
@props.onChange(@state.selectedDate.format(@props.format))
@setState inputValue: @state.selectedDate.format("MM/DD/YY H:mm A")
@setState inputValue: @state.selectedDate.format(@props.inputFormat)

setSelectedMinute: (e) ->
@setState selectedDate: @state.selectedDate.clone().hour(@state.selectedDate.hours()).minute(parseInt(e.target.innerHTML)), ->
@closePicker()
@props.onChange(@state.selectedDate.format(@props.format))
@setState inputValue: @state.selectedDate.format("MM/DD/YY H:mm A")
@setState inputValue: @state.selectedDate.format(@props.inputFormat)

setViewMonth: (month) ->
@setState viewDate: @state.viewDate.clone().month(month)
Expand Down Expand Up @@ -243,7 +243,7 @@ DateTimeField = React.createClass(
togglePeriod={this.togglePeriod}
/>
<div className="input-group date" ref="datetimepicker">
<input type="text" className="form-control" onChange={this.onChange} value={this.state.selectedDate.format("MM/DD/YY h:mm A")} />
<input type="text" className="form-control" onChange={this.onChange} value={this.state.selectedDate.format(this.props.inputFormat)} />
<span className="input-group-addon" onClick={this.onClick} onBlur={this.onBlur} ref="dtpbutton"><Glyphicon glyph="calendar" /></span>
</div>
</div>
Expand Down