);
}
@@ -116,7 +116,7 @@ var User = React.createClass({
});
```
-To better understand what is happening with `activeRoute` perhaps an
+To better understand what is happening with `activeRouteHandler` perhaps an
example without the router will help. Lets take the scenario where
`/users/2` has been matched. Your render method, without this router,
might look something like this:
@@ -124,8 +124,8 @@ might look something like this:
```js
render: function() {
var user = ;
- var users = ;
- return ;
+ var users = ;
+ return ;
}
```
@@ -190,7 +190,7 @@ routes do not inherit the path of their parent.
Routes can be nested. When a child route matches, the parent route's
handler will have an instance of the child route's handler available as
-`this.props.activeRoute()`. You can then render it in the parent
+`this.props.activeRouteHandler()`. You can then render it in the parent
passing in any additional props as needed.
#### Examples
@@ -225,7 +225,7 @@ props and static methods available to these components.
#### Props
-**this.props.activeRoute(extraProps)** - The active child route handler.
+**this.props.activeRouteHandler(extraProps)** - The active child route handler.
Use it in your render method to render the child route, passing in
additional properties as needed.
diff --git a/examples/auth-flow/app.js b/examples/auth-flow/app.js
index 91b17166c9..5ce0edcdb4 100644
--- a/examples/auth-flow/app.js
+++ b/examples/auth-flow/app.js
@@ -34,7 +34,7 @@ var App = React.createClass({
);
diff --git a/examples/transitions/app.js b/examples/transitions/app.js
index fca1ee4f95..c14c7b1cfb 100644
--- a/examples/transitions/app.js
+++ b/examples/transitions/app.js
@@ -12,7 +12,7 @@ var App = React.createClass({
Dashboard
Form
- {this.props.activeRoute() ||
Home
}
+ {this.props.activeRouteHandler() ||
Home
}
);
}
diff --git a/modules/components/Route.js b/modules/components/Route.js
index 08b946807c..1b075e60dd 100644
--- a/modules/components/Route.js
+++ b/modules/components/Route.js
@@ -69,13 +69,13 @@ var REF_NAME = '__activeRoute__';
* ), document.body);
*
* Handlers for Route components that contain children can render their active
- * child route using the activeRoute prop.
+ * child route using the activeRouteHandler prop.
*
* var App = React.createClass({
* render: function () {
* return (
*