Skip to content

Commit

Permalink
Merge pull request #2025 from CameronFletcher92/timepicker-fix
Browse files Browse the repository at this point in the history
Added keys to timepicker buttons, fixed #1964
  • Loading branch information
oliviertassinari committed Nov 1, 2015
2 parents edaf30f + b13fe11 commit 68baf9b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/time-picker/clock.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ const Clock = React.createClass({

if (this.props.format === 'ampm'){
buttons = [
<ClockButton position="left" onTouchTap={this._setAffix.bind(this, "am")} selected={isAM} >{"AM"}</ClockButton>,
<ClockButton position="right" onTouchTap={this._setAffix.bind(this, "pm")} selected={!isAM} >{"PM"}</ClockButton>,
<ClockButton key="AM" position="left" onTouchTap={this._setAffix.bind(this, "am")} selected={isAM} >{"AM"}</ClockButton>,
<ClockButton key="PM" position="right" onTouchTap={this._setAffix.bind(this, "pm")} selected={!isAM} >{"PM"}</ClockButton>,
];
}
return buttons;
Expand Down

0 comments on commit 68baf9b

Please sign in to comment.