Merge pull request #66 from brigand/react-0.14

updates to react 0.14
mosch · Oct 10, 2015 · b921589 · b921589
2 parents 2428e5b + a44e99d
commit b921589
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/index.js b/index.js
@@ -1,4 +1,5 @@
 var React = require('react');
+var ReactDOM = require('react-dom');
 
 var isTouchDevice =
     !!(typeof window !== 'undefined' &&
@@ -126,7 +127,7 @@ var AvatarEditor = React.createClass({
     },
 
     componentDidMount() {
-        var context = React.findDOMNode(this.refs.canvas).getContext('2d');
+        var context = ReactDOM.findDOMNode(this.refs.canvas).getContext('2d');
         if (this.props.image) {
             this.loadImage(this.props.image);
         }
@@ -143,7 +144,7 @@ var AvatarEditor = React.createClass({
     },
 
     componentDidUpdate() {
-        var context = React.findDOMNode(this.refs.canvas).getContext('2d');
+        var context = ReactDOM.findDOMNode(this.refs.canvas).getContext('2d');
         context.clearRect(0, 0, this.getDimensions().canvas.width, this.getDimensions().canvas.height);
         this.paint(context);
         this.paintImage(context, this.state.image, this.props.border);
@@ -338,4 +339,4 @@ var AvatarEditor = React.createClass({
     }
 });
 
-export default AvatarEditor;
+export default AvatarEditor;
diff --git a/package.json b/package.json
@@ -4,10 +4,10 @@
     "description": "Facebook like avatar / profile picture component. Resize and crop your uploaded image using a intuitive user interface.",
     "main": "dist/index.js",
     "scripts": {
-        "demo":        "watchify -t reactify example/app.js -o example/bundle.js -v",
-        "build":       "babel --modules umd index.js | uglifyjs > dist/index.js",
+        "demo": "watchify -t reactify example/app.js -o example/bundle.js -v",
+        "build": "babel --modules umd index.js | uglifyjs > dist/index.js",
         "build-debug": "babel --modules umd index.js > dist/index.js",
-        "watch":       "babel --modules umd index.js -w -o dist/index.js"
+        "watch": "babel --modules umd index.js -w -o dist/index.js"
     },
     "author": {
         "name": "Moritz Schwoerer",
@@ -36,10 +36,11 @@
     ],
     "devDependencies": {
         "babel": "^5.5.8",
-        "react": "0.13.x",
         "http-server": "^0.7.4",
-        "watchify": "^3.2.2",
+        "react": "^0.14.0",
+        "react-dom": "^0.14.0",
         "reactify": "0.17.1",
-        "uglifyjs": "^2.4.10"
+        "uglifyjs": "^2.4.10",
+        "watchify": "^3.2.2"
     }
 }