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

Update 3pids section visibility when id server set / unset

pull/21833/head
David Baker 2019-08-13 18:40:27 +01:00
parent c80c8dcf24
commit 7c35107a37
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ import {_t} from "../../../languageHandler";
import sdk from '../../../index'; import sdk from '../../../index';
import MatrixClientPeg from "../../../MatrixClientPeg"; import MatrixClientPeg from "../../../MatrixClientPeg";
import SdkConfig from "../../../SdkConfig"; import SdkConfig from "../../../SdkConfig";
import Field from "../elements/Field"; import dis from "../../../dispatcher";
/** /**
* If a url has no path component, etc. abbreviate it to just the hostname * If a url has no path component, etc. abbreviate it to just the hostname
@ -138,6 +138,7 @@ export default class SetIdServer extends React.Component {
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);
dis.dispatch({action: 'id_server_changed'});
newFormValue = ''; newFormValue = '';
} }
this.setState({ this.setState({
@ -170,6 +171,7 @@ export default class SetIdServer extends React.Component {
} }
const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
const Field = sdk.getComponent('elements.Field');
return ( return (
<form className="mx_SettingsTab_section mx_SetIdServer" onSubmit={this._saveIdServer}> <form className="mx_SettingsTab_section mx_SetIdServer" onSubmit={this._saveIdServer}>
<span className="mx_SettingsTab_subheading"> <span className="mx_SettingsTab_subheading">

15
src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
View File

@ -45,9 +45,22 @@ export default class GeneralUserSettingsTab extends React.Component {
this.state = { this.state = {
language: languageHandler.getCurrentLanguage(), language: languageHandler.getCurrentLanguage(),
theme: SettingsStore.getValueAt(SettingLevel.ACCOUNT, "theme"), theme: SettingsStore.getValueAt(SettingLevel.ACCOUNT, "theme"),
haveIdServer: Boolean(MatrixClientPeg.get().getIdentityServerUrl()),
}; };
this.dispatcherRef = dis.register(this._onAction);
} }
componentWillUnmount() {
dis.unregister(this.dispatcherRef);
}
_onAction = (payload) => {
if (payload.action === 'id_server_changed') {
this.setState({haveIdServer: Boolean(MatrixClientPeg.get().getIdentityServerUrl())});
}
};
_onLanguageChange = (newLanguage) => { _onLanguageChange = (newLanguage) => {
if (this.state.language === newLanguage) return; if (this.state.language === newLanguage) return;
@ -124,7 +137,7 @@ export default class GeneralUserSettingsTab extends React.Component {
onFinished={this._onPasswordChanged} /> onFinished={this._onPasswordChanged} />
); );
const threepidSection = MatrixClientPeg.get().getIdentityServerUrl() ? <div> const threepidSection = this.state.haveIdServer ? <div>
<span className="mx_SettingsTab_subheading">{_t("Email addresses")}</span> <span className="mx_SettingsTab_subheading">{_t("Email addresses")}</span>
<EmailAddresses /> <EmailAddresses />