matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2026-01-03 21:42:32 +03:00
Code Activity

Merge pull request #228 from matrix-org/dbkr/fix_email_validation_hs_url

Browse Source 
Make getCurrent[H|I]SUrl honour the state setting that comes from the url bar
This commit is contained in:
David Baker
2016-03-17 11:39:55 +00:00
parent 577a7e3f06 b960d1d462
commit 59eab23af6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,9 @@ module.exports = React.createClass({
},
getCurrentHsUrl: function() {
if (MatrixClientPeg.get()) {
if (this.state.register_hs_url) {
return this.state.register_hs_url;
} else if (MatrixClientPeg.get()) {
return MatrixClientPeg.get().getHomeserverUrl();
}
else if (window.localStorage && window.localStorage.getItem("mx_hs_url")) {
@@ -99,7 +101,9 @@ module.exports = React.createClass({
},
getCurrentIsUrl: function() {
if (MatrixClientPeg.get()) {
if (this.state.register_is_url) {
return this.state.register_is_url;
} else if (MatrixClientPeg.get()) {
return MatrixClientPeg.get().getIdentityServerUrl();
}
else if (window.localStorage && window.localStorage.getItem("mx_is_url")) {