Merge pull request Hacker0x01#199 from arnaudbenard/master

fix Hacker0x01#198: Updated to react 0.14

Author: martijnrusschen

package.json

@@ -45,19 +45,21 @@
     "karma-webpack": "^1.7.0",
     "mocha": "^2.2.5",
     "phantomjs": "^1.9.17",
-    "react": ">=0.12 <0.14",
+    "react": ">=0.12 <0.15",
+    "react-addons-test-utils": "^0.14.0",
+    "react-dom": "^0.14.0",
     "sinon": "^1.15.4",
     "webpack": "^1.7.2",
     "webpack-dev-server": "^1.7.0"
   },
   "peerDependencies": {
-    "react": ">=0.12 <0.14"
+    "react": ">=0.12 <0.15"
   },
   "dependencies": {
+    "lodash": "^3.10.0",
     "moment": "^2.10",
-    "tether": "^1.1.0",
     "react-onclickoutside": "0.3.0",
-    "lodash": "^3.10.0"
+    "tether": "^1.1.0"
   },
   "scripts": {
     "test": "grunt travis"

src/date_input.jsx

@@ -1,7 +1,7 @@
 var React = require( "react" );
+var ReactDOM = require( "react-dom" );
 var DateUtil = require( "./util/date" );
 var moment = require( "moment" );
-
 var DateInput = React.createClass( {
 
   getDefaultProps: function() {
@@ -22,9 +22,9 @@ var DateInput = React.createClass( {
 
   toggleFocus: function( focus ) {
     if ( focus ) {
-      React.findDOMNode( this.refs.input ).focus();
+      ReactDOM.findDOMNode( this.refs.input ).focus();
     } else {
-      React.findDOMNode( this.refs.input ).blur();
+      ReactDOM.findDOMNode( this.refs.input ).blur();
     }
   },
 

src/popover.jsx

@@ -1,4 +1,5 @@
 var React = require( "react" );
+var ReactDOM = require( "react-dom" );
 
 var Popover = React.createClass( {
   displayName: "Popover",
@@ -52,7 +53,7 @@ var Popover = React.createClass( {
   _tetherOptions: function() {
     return {
       element: this._popoverElement,
-      target: this.getDOMNode().parentElement.querySelector( "input" ),
+      target: ReactDOM.findDOMNode( this ).parentElement.querySelector( "input" ),
       attachment: this.props.attachment,
       targetAttachment: this.props.targetAttachment,
       targetOffset: this.props.targetOffset,
@@ -76,7 +77,7 @@ var Popover = React.createClass( {
 
   componentWillUnmount: function() {
     this._tether.destroy();
-    React.unmountComponentAtNode( this._popoverElement );
+    ReactDOM.unmountComponentAtNode( this._popoverElement );
     if ( this._popoverElement.parentNode ) {
       this._popoverElement.parentNode.removeChild( this._popoverElement );
     }

test/date_input_test.js

@@ -1,5 +1,6 @@
-var React = require( "react/addons" );
-var TestUtils = React.addons.TestUtils;
+var React = require( "react" );
+var ReactDOM = require( "react-dom" );
+var TestUtils = require( "react-addons-test-utils" );
 var DateInput = require( "../src/date_input.jsx" );
 
 describe( "DateInput", function() {
@@ -11,7 +12,7 @@ describe( "DateInput", function() {
       <DateInput date={dateMock} handleEnter={done} />
     );
 
-    TestUtils.Simulate.keyDown( dateInput.getDOMNode(), { key: "Enter" } );
+    TestUtils.Simulate.keyDown( ReactDOM.findDOMNode( dateInput ), { key: "Enter" } );
   } );
 
   it( "adds disabled attribute to input field when disabled is passed as prop", function() {
@@ -27,6 +28,6 @@ describe( "DateInput", function() {
       <DateInput className="datepicker__custom-input" />
     );
 
-    expect( dateInput.getDOMNode().className ).to.equal( "datepicker__custom-input" );
+    expect( ReactDOM.findDOMNode( dateInput ).className ).to.equal( "datepicker__custom-input" );
   } );
 } );