From fa9c2d137330e6e90891132fa3b4a42c4ee03afd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 25 Apr 2017 19:21:09 +0100
Subject: [PATCH] Fix specifying custom server for registration
Broken by https://github.com/matrix-org/matrix-react-sdk/commit/9cd7914ea51dbfb60f8b84a80cb800282476d3e4
(ServerConfig interface changed but Registration not updated)
---
.../structures/login/Registration.js | 24 +++++++++----------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 4e0d61e716..5501a39b58 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -123,18 +123,17 @@ module.exports = React.createClass({
}
},
- onHsUrlChanged: function(newHsUrl) {
- this.setState({
- hsUrl: newHsUrl,
+ onServerConfigChange: function(config) {
+ let newState = {};
+ if (config.hsUrl !== undefined) {
+ newState.hsUrl = config.hsUrl;
+ }
+ if (config.isUrl !== undefined) {
+ newState.isUrl = config.isUrl;
+ }
+ this.setState(newState, function() {
+ this._replaceClient();
});
- this._replaceClient();
- },
-
- onIsUrlChanged: function(newIsUrl) {
- this.setState({
- isUrl: newIsUrl,
- });
- this._replaceClient();
},
_replaceClient: function() {
@@ -390,8 +389,7 @@ module.exports = React.createClass({
customIsUrl={this.props.customIsUrl}
defaultHsUrl={this.props.defaultHsUrl}
defaultIsUrl={this.props.defaultIsUrl}
- onHsUrlChanged={this.onHsUrlChanged}
- onIsUrlChanged={this.onIsUrlChanged}
+ onServerConfigChange={this.onServerConfigChange}
delayTimeMs={1000}
/>
</div>