OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename functions

pull/21833/head
Travis Ralston 2019-08-19 10:27:57 -06:00
parent de3c489fba
commit 32abfbbfc6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/views/settings/SetIdServer.js
View File

@ -130,7 +130,7 @@ export default class SetIdServer extends React.Component {
return !!this.state.idServer && !this.state.busy; return !!this.state.idServer && !this.state.busy;
}; };
_continueTerms = (fullUrl) => { _saveIdServer = (fullUrl) => {
MatrixClientPeg.get().setIdentityServerUrl(fullUrl); MatrixClientPeg.get().setIdentityServerUrl(fullUrl);
localStorage.removeItem("mx_is_access_token"); localStorage.removeItem("mx_is_access_token");
localStorage.setItem("mx_is_url", fullUrl); localStorage.setItem("mx_is_url", fullUrl);
@ -138,7 +138,7 @@ export default class SetIdServer extends React.Component {
this.setState({idServer: '', busy: false, error: null}); this.setState({idServer: '', busy: false, error: null});
}; };
_saveIdServer = async (e) => { _checkIdServer = async (e) => {
e.preventDefault(); e.preventDefault();
this.setState({busy: true, checking: true, error: null}); this.setState({busy: true, checking: true, error: null});
@ -174,13 +174,13 @@ export default class SetIdServer extends React.Component {
button: _t("Continue"), button: _t("Continue"),
onFinished: async (confirmed) => { onFinished: async (confirmed) => {
if (!confirmed) return; if (!confirmed) return;
this._continueTerms(fullUrl); this._saveIdServer(fullUrl);
}, },
}); });
return; return;
} }
this._continueTerms(fullUrl); this._saveIdServer(fullUrl);
} catch (e) { } catch (e) {
console.error(e); console.error(e);
errStr = _t("Terms of service not accepted or the identity server is invalid."); errStr = _t("Terms of service not accepted or the identity server is invalid.");
@ -299,7 +299,7 @@ export default class SetIdServer extends React.Component {
} }
return ( return (
<form className="mx_SettingsTab_section mx_SetIdServer" onSubmit={this._saveIdServer}> <form className="mx_SettingsTab_section mx_SetIdServer" onSubmit={this._checkIdServer}>
<span className="mx_SettingsTab_subheading"> <span className="mx_SettingsTab_subheading">
{sectionTitle} {sectionTitle}
</span> </span>
@ -313,7 +313,7 @@ export default class SetIdServer extends React.Component {
tooltipContent={this._getTooltip()} tooltipContent={this._getTooltip()}
/> />
<AccessibleButton type="submit" kind="primary_sm" <AccessibleButton type="submit" kind="primary_sm"
onClick={this._saveIdServer} onClick={this._checkIdServer}
disabled={!this._idServerChangeEnabled()} disabled={!this._idServerChangeEnabled()}
>{_t("Change")}</AccessibleButton> >{_t("Change")}</AccessibleButton>
{discoSection} {discoSection}