OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-09-28 12:20:55 +00:00
parent b40bc8ff8c 5765d59132
commit 8e26a6a0a6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/MatrixChat.js
View File

@ -286,6 +286,14 @@ export default React.createClass({
register_hs_url: paramHs, register_hs_url: paramHs,
}); });
} }
// Set a default IS with query param `is_url`
const paramIs = this.props.startingFragmentQueryParams.is_url;
if (paramIs) {
console.log('Setting register_is_url ', paramIs);
this.setState({
register_is_url: paramIs,
});
}
// a thing to call showScreen with once login completes. this is kept // a thing to call showScreen with once login completes. this is kept
// outside this.state because updating it should never trigger a // outside this.state because updating it should never trigger a