Merge pull request Hacker0x01#451 from Hacker0x01/allow-react-15

Allow react 15

Author: rafeememon

.babelrc

@@ -8,9 +8,6 @@
             "transform": "react-transform-hmr",
             "imports": ["react"],
             "locals": ["module"]
-          }, {
-            "transform": "react-transform-catch-errors",
-            "imports": ["react", "redbox-react"]
           }]
         }]
       ]

.travis.yml

@@ -12,10 +12,6 @@ addons:
       - g++-4.8
 rvm:
   - 2.1.7
-cache:
-  directories:
-    - node_modules
-    - vendor/bundle
 before_install:
   - npm install -g grunt-cli
   - gem update --system && gem install scss_lint -v 0.44.0

package.json

@@ -66,12 +66,9 @@
     "lodash": "^4.3.0",
     "mocha": "^2.2.5",
     "node-sass": "^3.4.2",
-    "react-addons-test-utils": "^0.14.0",
+    "react-addons-test-utils": "^15.0.0",
     "react-docgen": "^2.7.0",
-    "react-dom": "^0.14.0",
-    "react-transform-catch-errors": "^1.0.0",
     "react-transform-hmr": "^1.0.1",
-    "redbox-react": "^1.2.0",
     "sass-loader": "^3.1.2",
     "sinon": "^1.15.4",
     "style-loader": "^0.13.0",
@@ -81,8 +78,8 @@
     "webpack-hot-middleware": "^2.6.0"
   },
   "peerDependencies": {
-    "react": "^0.14.0",
-    "react-dom": "^0.14.0"
+    "react": "^0.14.0 || ^15.0.0",
+    "react-dom": "^0.14.0 || ^15.0.0"
   },
   "dependencies": {
     "classnames": "^2.2.1",

src/date_input.jsx

@@ -28,7 +28,7 @@ var DateInput = React.createClass({
 
   getInitialState () {
     return {
-      maybeDate: this.safeDateFormat(this.props)
+      value: this.safeDateFormat(this.props)
     }
   },
 
@@ -37,7 +37,7 @@ var DateInput = React.createClass({
           newProps.locale !== this.props.locale ||
           newProps.dateFormat !== this.props.dateFormat) {
       this.setState({
-        maybeDate: this.safeDateFormat(newProps)
+        value: this.safeDateFormat(newProps)
       })
     }
   },
@@ -60,20 +60,18 @@ var DateInput = React.createClass({
         this.props.onChangeDate(null)
       }
     }
-    this.setState({
-      maybeDate: value
-    })
+    this.setState({value})
   },
 
   safeDateFormat (props) {
     return props.date && props.date.clone()
       .locale(props.locale || moment.locale())
-      .format(props.dateFormat)
+      .format(props.dateFormat) || ''
   },
 
   handleBlur (event) {
     this.setState({
-      maybeDate: this.safeDateFormat(this.props)
+      value: this.safeDateFormat(this.props)
     })
     if (this.props.onBlur) {
       this.props.onBlur(event)
@@ -89,7 +87,7 @@ var DateInput = React.createClass({
         ref='input'
         type='text'
         {...this.props}
-        value={this.state.maybeDate}
+        value={this.state.value}
         onBlur={this.handleBlur}
         onChange={this.handleChange} />
   }