imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
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() { 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(); return MatrixClientPeg.get().getHomeserverUrl();
} }
else if (window.localStorage && window.localStorage.getItem("mx_hs_url")) { else if (window.localStorage && window.localStorage.getItem("mx_hs_url")) {
@ -99,7 +101,9 @@ module.exports = React.createClass({
}, },
getCurrentIsUrl: function() { 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(); return MatrixClientPeg.get().getIdentityServerUrl();
} }
else if (window.localStorage && window.localStorage.getItem("mx_is_url")) { else if (window.localStorage && window.localStorage.getItem("mx_is_url")) {