Skip to content

Added keys to timepicker buttons, fixed #1964 #2025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oliviertassinari merged 2 commits into from
Nov 1, 2015
Merged

Added keys to timepicker buttons, fixed #1964 #2025

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3920ac
Added keys to timepicker buttons, fixed #1964
camfletch Oct 31, 2015
b13fe11
changed timepicker button keys to AM/PM
camfletch Oct 31, 2015
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
4 changes: 2 additions & 2 deletions src/time-picker/clock.jsx
View file
Open in desktop
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="1" position="left" onTouchTap={this._setAffix.bind(this, "am")} selected={isAM} >{"AM"}</ClockButton>,
Copy link
Copy Markdown
Member

@oliviertassinari oliviertassinari Oct 31, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AM instead?

<ClockButton key="2" position="right" onTouchTap={this._setAffix.bind(this, "pm")} selected={!isAM} >{"PM"}</ClockButton>,
];
}
return buttons;
Expand Down