fix bug

diff --git a/HISTORY.md b/HISTORY.md
index d6edd4e271e2b741ea967b37969142f5a18fe6b0..21cbbb9799e9cf5d84fa248905ffa2207f2a0889 100644 (file)
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,7 +3,7 @@ History
 
 ---
 
-0.3.2 / 2015-11-17
+0.3.3 / 2015-11-17
 ------------------
 
 `fix` fix some bugs.

diff --git a/package.json b/package.json
index 0ead0b1cc471443b014d915a3949d83936ef2fbd..13c2ded8eb53161193901ba61771c60b8eb5e837 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rc-time-picker",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "React TimePicker",
   "keywords": [
     "react",

diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx
index f0a3316c1b2d86d7264c06d044623e20c0b21e59..02ed5a2d394c1df6e0665baa00844c1c64e5eaab 100644 (file)
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@ -130,7 +130,7 @@ const Picker = React.createClass({
   },
 
   render() {
-    const { prefixCls, placement, align, disabled, transitionName, children, formatter } = this.props;
+    const { prefixCls, placeholder, placement, align, disabled, transitionName, children, formatter } = this.props;
     const { open, value } = this.state;
 
     return (
@@ -147,7 +147,7 @@ const Picker = React.createClass({
         onPopupVisibleChange={this.onVisibleChange}
       >
         <span className={`${prefixCls}-picker`}>
-          <input ref="picker" type="text" placeholder="请选择时间" readOnly disabled={disabled} value={value && formatter.format(value)} />
+          <input ref="picker" type="text" placeholder={placeholder} readOnly disabled={disabled} value={value && formatter.format(value)} />
           <span className={`${prefixCls}-picker-icon`} />
         </span>
       </Trigger>