Merge branch 'master' of github.com:react-component/time-picker

diff --git a/README.md b/README.md
index 4a368151a09f582c0674f0a3134859e0d8384249..c994218846bd73075135d213577211be51b83e48 100644 (file)
--- a/README.md
+++ b/README.md
@@ -73,7 +73,6 @@ API
 | transitionName          | String                            | ''                                            |                                                                                            |
 | name                    | String                            | nothing                                       | sets the name of the generated input                                                       |
 
-
 ## Test Case
 
 ```

diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx
index aa3e0da726f009c6e54b69696945b8b382048765..4d7d4d6c7416c2953711abd6a8b054273de45b7a 100644 (file)
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@ -42,6 +42,7 @@ const Picker = React.createClass({
     onClose: PropTypes.func,
     addon: PropTypes.func,
     name: PropTypes.string,
+    autoComplete: PropTypes.string,
   },
 
   getDefaultProps() {
@@ -193,7 +194,7 @@ const Picker = React.createClass({
     const {
       prefixCls, placeholder, placement, align,
       disabled, transitionName, style, className, showHour,
-      showMinute, showSecond, getPopupContainer, name,
+      showMinute, showSecond, getPopupContainer, name, autoComplete,
     } = this.props;
     const { open, value } = this.state;
     let popupClassName;
@@ -225,6 +226,7 @@ const Picker = React.createClass({
             readOnly
             onKeyDown={this.onKeyDown}
             disabled={disabled} value={value && value.format(this.getFormat()) || ''}
+            autoComplete={autoComplete}
           />
           <span className={`${prefixCls}-icon`}/>
         </span>