Skip to content

Fixed incomplete edits #1311

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 4 commits into from
Jun 18, 2015
Merged

Fixed incomplete edits #1311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd1d242
Fixed incomplete edit
Jun 15, 2015
7cc4a5e
Fixed property name
Jun 15, 2015
81b7406
Updated Link's doc comment.
Jun 15, 2015
22511ed
Fixed a minor typo.
Jun 15, 2015
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
6 changes: 3 additions & 3 deletions doc/02 Components/Link.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ applies its `activeClassName` and/or `activeStyle` when it is.
Props
-----

### `href`
### `to`

The path to link to, ie `/users/123`.
The path to link to, e.g., `/users/123`.

### `query`

An object of key:value pairs to be stingified.
An object of key:value pairs to be stringified.

### `activeClassName`

Expand Down
2 changes: 1 addition & 1 deletion examples/auth-flow/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ var Login = React.createClass({

var { location } = this.props;

if (location.query && location.state.nextPathname) {
if (location.state && location.state.nextPathname) {
this.replaceWith(location.state.nextPathname);
} else {
this.replaceWith('/about');
Expand Down
6 changes: 3 additions & 3 deletions modules/Link.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ function isModifiedEvent(event) {
*
* You could use the following component to link to that route:
*
* <Link to="showPost" params={{ postID: "123" }} />
* <Link to={`/posts/${post.id}`} />
*
* In addition to params, links may pass along query string parameters
* Links may pass along query string parameters
* using the `query` prop.
*
* <Link to="showPost" params={{ postID: "123" }} query={{ show:true }}/>
* <Link to="/posts/123" query={{ show:true }}/>
*/
export var Link = React.createClass({

Expand Down