From e3920ac8d6b84b85490e2baa684c7c24e7fb0cb1 Mon Sep 17 00:00:00 2001
From: Cameron Fletcher <cameronfletcher92@gmail.com>
Date: Sun, 1 Nov 2015 00:14:17 +1000
Subject: [PATCH 1/2] Added keys to timepicker buttons, fixed #1964

---
 src/time-picker/clock.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/time-picker/clock.jsx b/src/time-picker/clock.jsx
index 42a69838ac759d..8936f115dc1132 100644
--- a/src/time-picker/clock.jsx
+++ b/src/time-picker/clock.jsx
@@ -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>,
+        <ClockButton key="2" position="right" onTouchTap={this._setAffix.bind(this, "pm")} selected={!isAM} >{"PM"}</ClockButton>,
       ];
     }
     return buttons;

From b13fe11e6fb72cc5858f53d325b837ed16227d8c Mon Sep 17 00:00:00 2001
From: Cameron Fletcher <cameronfletcher92@gmail.com>
Date: Sun, 1 Nov 2015 00:24:16 +1000
Subject: [PATCH 2/2] changed timepicker button keys to AM/PM

---
 src/time-picker/clock.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/time-picker/clock.jsx b/src/time-picker/clock.jsx
index 8936f115dc1132..a6979a5396ef41 100644
--- a/src/time-picker/clock.jsx
+++ b/src/time-picker/clock.jsx
@@ -80,8 +80,8 @@ const Clock = React.createClass({
 
     if (this.props.format === 'ampm'){
       buttons = [
-        <ClockButton key="1" position="left" onTouchTap={this._setAffix.bind(this, "am")} selected={isAM} >{"AM"}</ClockButton>,
-        <ClockButton key="2" 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;