diff options
author | Antony Shaleynikov <shaleynikov@gmail.com> | 2017-03-01 23:58:06 +0300 |
---|---|---|
committer | Antony Shaleynikov <shaleynikov@gmail.com> | 2017-03-01 23:58:06 +0300 |
commit | 95699887ac75de5dff6bd25278289e31e4745482 (patch) | |
tree | 1d3ba6855fa867e90e380be4312578777736ff73 /src/TimePicker.jsx | |
parent | 19b96283c09e678b8b7ea5c60569996a0bab5935 (diff) | |
download | time-picker-95699887ac75de5dff6bd25278289e31e4745482.tar.gz time-picker-95699887ac75de5dff6bd25278289e31e4745482.tar.zst time-picker-95699887ac75de5dff6bd25278289e31e4745482.zip |
Added 12hours display support
Diffstat (limited to 'src/TimePicker.jsx')
-rw-r--r-- | src/TimePicker.jsx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx index e9d6d15..f73d2b1 100644 --- a/src/TimePicker.jsx +++ b/src/TimePicker.jsx | |||
@@ -43,6 +43,7 @@ const Picker = React.createClass({ | |||
43 | addon: PropTypes.func, | 43 | addon: PropTypes.func, |
44 | name: PropTypes.string, | 44 | name: PropTypes.string, |
45 | autoComplete: PropTypes.string, | 45 | autoComplete: PropTypes.string, |
46 | show12Hours: PropTypes.bool, | ||
46 | }, | 47 | }, |
47 | 48 | ||
48 | getDefaultProps() { | 49 | getDefaultProps() { |
@@ -67,6 +68,7 @@ const Picker = React.createClass({ | |||
67 | onOpen: noop, | 68 | onOpen: noop, |
68 | onClose: noop, | 69 | onClose: noop, |
69 | addon: noop, | 70 | addon: noop, |
71 | show12Hours: false, | ||
70 | }; | 72 | }; |
71 | }, | 73 | }, |
72 | 74 | ||
@@ -142,7 +144,7 @@ const Picker = React.createClass({ | |||
142 | prefixCls, placeholder, disabledHours, | 144 | prefixCls, placeholder, disabledHours, |
143 | disabledMinutes, disabledSeconds, hideDisabledOptions, | 145 | disabledMinutes, disabledSeconds, hideDisabledOptions, |
144 | allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText, | 146 | allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText, |
145 | addon, | 147 | addon, show12Hours, |
146 | } = this.props; | 148 | } = this.props; |
147 | return ( | 149 | return ( |
148 | <Panel | 150 | <Panel |
@@ -164,6 +166,7 @@ const Picker = React.createClass({ | |||
164 | disabledMinutes={disabledMinutes} | 166 | disabledMinutes={disabledMinutes} |
165 | disabledSeconds={disabledSeconds} | 167 | disabledSeconds={disabledSeconds} |
166 | hideDisabledOptions={hideDisabledOptions} | 168 | hideDisabledOptions={hideDisabledOptions} |
169 | show12Hours={show12Hours} | ||
167 | addon={addon} | 170 | addon={addon} |
168 | /> | 171 | /> |
169 | ); | 172 | ); |