PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1347 from matrix-org/dbkr/unbreak_password_reset_alt_hs

Browse source 
Unbreak password reset with a non-default HS
This commit is contained in:
Luke Barnard 2017-08-29 14:52:08 +01:00 committed by GitHub
commit 3fde35b16d
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/components/structures/login/ForgotPassword.js
View file

@ -136,16 +136,15 @@ module.exports = React.createClass({
}); });
}, },
onHsUrlChanged: function(newHsUrl) { onServerConfigChange: function(config) {
this.setState({ const newState = {};
enteredHomeserverUrl: newHsUrl if (config.hsUrl !== undefined) {
}); newState.enteredHomeserverUrl = config.hsUrl;
}, }
if (config.isUrl !== undefined) {
onIsUrlChanged: function(newIsUrl) { newState.enteredIdentityServerUrl = config.isUrl;
this.setState({ }
enteredIdentityServerUrl: newIsUrl this.setState(newState);
});
}, },
showErrorDialog: function(body, title) { showErrorDialog: function(body, title) {
@ -221,8 +220,7 @@ module.exports = React.createClass({
defaultIsUrl={this.props.defaultIsUrl} defaultIsUrl={this.props.defaultIsUrl}
customHsUrl={this.props.customHsUrl} customHsUrl={this.props.customHsUrl}
customIsUrl={this.props.customIsUrl} customIsUrl={this.props.customIsUrl}
onHsUrlChanged={this.onHsUrlChanged} onServerConfigChange={this.onServerConfigChange}
onIsUrlChanged={this.onIsUrlChanged}
delayTimeMs={0}/> delayTimeMs={0}/>
<div className="mx_Login_error"> <div className="mx_Login_error">
</div> </div>