mirror of https://github.com/vector-im/riot-web
Make getCurrent[H|I]SUrl honour the state setting that comes from the url bar.
Fixes @ara4n's later bug in https://github.com/vector-im/vector-web/issues/1027pull/21833/head
parent
577a7e3f06
commit
b960d1d462
|
@ -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")) {
|
||||
|
|
Loading…
Reference in New Issue