Skip to content

Commit

Permalink
[changed] Upgrade to React 0.11.0
Browse files Browse the repository at this point in the history
Fixes #87
  • Loading branch information
mjackson committed Jul 22, 2014
1 parent 51e1be2 commit 3b590e0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions modules/components/Route.js
Expand Up @@ -214,10 +214,8 @@ var Route = React.createClass({
},

render: function () {
// TODO: In React 0.11 we will be able to `return null` here.
// https://github.com/facebook/react/issues/1058
if (!this.state.path)
return React.DOM.div();
return null;

return this.props.handler(computeHandlerProps(this.state.matches || [], this.state.activeQuery));
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -37,14 +37,14 @@
"karma-mocha": "^0.1.3",
"karma-webpack": "^1.2.1",
"mocha": "^1.20.1",
"react": ">=0.10.0",
"react": ">=0.11.0",
"rf-release": "^0.1.2",
"uglify-js": "^2.4.15",
"webpack": "^1.2.0-beta5",
"webpack-dev-server": "^1.4.2"
},
"peerDependencies": {
"react": ">=0.10.0"
"react": ">=0.11.0"
},
"dependencies": {
"es6-promise": "^1.0.0",
Expand Down

0 comments on commit 3b590e0

Please sign in to comment.