Skip to content

turn activeRoute into a function that returns null when no child routes are active #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 18, 2014
Merged

turn activeRoute into a function that returns null when no child routes are active #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions examples/master-detail/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ var App = React.createClass({
var contacts = this.state.contacts.map(function(contact) {
return <li key={contact.id}><Link to="contact" id={contact.id}>{contact.first}</Link></li>
});
var content = (this.props.activeRoute) ? this.props.activeRoute() : this.indexTemplate();
return (
<div className="App">
<div className="ContactList">
Expand All @@ -121,7 +120,7 @@ var App = React.createClass({
</ul>
</div>
<div className="Content">
{content}
{this.props.activeRoute() || this.indexTemplate()}
</div>
</div>
);
Expand Down
5 changes: 3 additions & 2 deletions modules/components/Route.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var React = require('react');
var warning = require('react/lib/warning');
var invariant = require('react/lib/invariant');
var emptyFunction = require('react/lib/emptyFunction');
var ExecutionEnvironment = require('react/lib/ExecutionEnvironment');
var mergeProperties = require('../helpers/mergeProperties');
var goBack = require('../helpers/goBack');
Expand Down Expand Up @@ -426,7 +427,7 @@ function computeHandlerProps(matches, query) {
key: null,
params: null,
query: null,
activeRoute: null
activeRoute: emptyFunction.thatReturnsNull
};

var childHandler;
Expand All @@ -443,7 +444,7 @@ function computeHandlerProps(matches, query) {
if (childHandler) {
props.activeRoute = childHandler;
} else {
props.activeRoute = null;
props.activeRoute = emptyFunction.thatReturnsNull;
}

childHandler = function (props, addedProps, children) {
Expand Down