ElyBy-Mirror/accounts-frontend
1
0
Fork 0
mirror of https://github.com/elyby/accounts-frontend.git synced 2025-01-30 15:29:33 +05:30
Code Issues Packages Projects Releases Wiki Activity

#138: fix a bug with hash applied to url after clicking on link on rules page

Browse Source
This commit is contained in:
SleepWalker 2016-06-28 13:07:28 +03:00
parent 95e7c0ae87
commit d2ca6b23c7
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/rules/RulesPage.jsx
View File

@ -25,7 +25,7 @@ const rules = [
<Message {...messages.mainProvision2} />, <Message {...messages.mainProvision2} />,
<Message {...messages.mainProvision3} />, <Message {...messages.mainProvision3} />,
<Message {...messages.mainProvision4} values={{ <Message {...messages.mainProvision4} values={{
link: (<Link to={'/register'}>https://account.ely.by/register</Link>) link: (<Link to="/register">https://account.ely.by/register</Link>)
}} /> }} />
] ]
}, },
@ -130,6 +130,11 @@ export default class RulesPage extends Component {
} }
onRuleClick(event) { onRuleClick(event) {
if (event.defaultPrevented || event.target.tagName.toLowerCase() === 'a') {
// some-one have already processed this event or it is a link
return;
}
const {id} = event.currentTarget; const {id} = event.currentTarget;
const {router} = this.context; const {router} = this.context;
const newLocation = router.createLocation({...location, hash: `#${id}`}); const newLocation = router.createLocation({...location, hash: `#${id}`});

6
src/services/authFlow/RegisterState.js
View File

@ -6,10 +6,10 @@ export default class RegisterState extends AbstractState {
enter(context) { enter(context) {
const {user} = context.getState(); const {user} = context.getState();
if (!user.isGuest) { if (user.isGuest) {
context.setState(new CompleteState());
} else {
context.navigate('/register'); context.navigate('/register');
} else {
context.setState(new CompleteState());
} }
} }