aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Combobox.jsx8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Combobox.jsx b/src/Combobox.jsx
index 958e108..00f122f 100644
--- a/src/Combobox.jsx
+++ b/src/Combobox.jsx
@@ -145,11 +145,15 @@ const Combobox = React.createClass({
145 }, 145 },
146 146
147 getAMPMSelect() { 147 getAMPMSelect() {
148 const { prefixCls, use12Hours } = this.props; 148 const { prefixCls, use12Hours, format } = this.props;
149 if (!use12Hours) { 149 if (!use12Hours) {
150 return null; 150 return null;
151 } 151 }
152 const AMPMOptions = [{ value: 'AM' }, { value: 'PM' }]; 152
153 const AMPMOptions = ['am', 'pm'] // If format has A char, then we should uppercase AM/PM
154 .map(c => format.match(/\sA/) ? c.toUpperCase() : c)
155 .map(c => ({ value: c }));
156
153 const selected = this.isAM() ? 0 : 1; 157 const selected = this.isAM() ? 0 : 1;
154 158
155 return ( 159 return (