From fd1d2429ce4090061cd1a313b7481b24be36306a Mon Sep 17 00:00:00 2001 From: Roman Boiko Date: Mon, 15 Jun 2015 20:00:57 +0300 Subject: [PATCH 1/4] Fixed incomplete edit --- examples/auth-flow/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/auth-flow/app.js b/examples/auth-flow/app.js index 2a9fc9b7b2..2b036e2043 100644 --- a/examples/auth-flow/app.js +++ b/examples/auth-flow/app.js @@ -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'); From 7cc4a5e9f6cbf58d52efa76e9d19d5a4c33f7907 Mon Sep 17 00:00:00 2001 From: Roman Boiko Date: Mon, 15 Jun 2015 20:20:36 +0300 Subject: [PATCH 2/4] Fixed property name --- doc/02 Components/Link.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/02 Components/Link.md b/doc/02 Components/Link.md index a223486c70..52b25003cf 100644 --- a/doc/02 Components/Link.md +++ b/doc/02 Components/Link.md @@ -7,7 +7,7 @@ applies its `activeClassName` and/or `activeStyle` when it is. Props ----- -### `href` +### `to` The path to link to, ie `/users/123`. From 81b74063d1fbeaafdcf2ca5167262f88cf1b19b5 Mon Sep 17 00:00:00 2001 From: Roman Boiko Date: Mon, 15 Jun 2015 20:45:30 +0300 Subject: [PATCH 3/4] Updated Link's doc comment. Link doesn't accept params anymore. --- modules/Link.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/Link.js b/modules/Link.js index 87506a8fed..11d892c6d5 100644 --- a/modules/Link.js +++ b/modules/Link.js @@ -21,12 +21,12 @@ function isModifiedEvent(event) { * * You could use the following component to link to that route: * - * + * * - * In addition to params, links may pass along query string parameters + * Links may pass along query string parameters * using the `query` prop. * - * + * */ export var Link = React.createClass({ From 22511edd51ae730cc5143efb03698e6d3dbc1728 Mon Sep 17 00:00:00 2001 From: Roman Boiko Date: Mon, 15 Jun 2015 20:58:42 +0300 Subject: [PATCH 4/4] Fixed a minor typo. --- doc/02 Components/Link.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/02 Components/Link.md b/doc/02 Components/Link.md index 52b25003cf..f162a188b4 100644 --- a/doc/02 Components/Link.md +++ b/doc/02 Components/Link.md @@ -9,11 +9,11 @@ Props ### `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`