Remove unused dialog, todo comments and other tiny tweaks
This commit is contained in:
parent
3bdedd73f7
commit
86025459f4
5 changed files with 2 additions and 51 deletions
|
@ -1,47 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright 2015, 2016 OpenMarket Ltd
|
|
||||||
Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import React from 'react';
|
|
||||||
import { _t } from '../../../languageHandler';
|
|
||||||
import SdkConfig from '../../../SdkConfig';
|
|
||||||
|
|
||||||
export default class CustomServerDialog extends React.Component {
|
|
||||||
render() {
|
|
||||||
const brand = SdkConfig.get().brand;
|
|
||||||
return (
|
|
||||||
<div className="mx_ErrorDialog">
|
|
||||||
<div className="mx_Dialog_title">
|
|
||||||
{ _t("Custom Server Options") }
|
|
||||||
</div>
|
|
||||||
<div className="mx_Dialog_content">
|
|
||||||
<p>{_t(
|
|
||||||
"You can use the custom server options to sign into other " +
|
|
||||||
"Matrix servers by specifying a different homeserver URL. This " +
|
|
||||||
"allows you to use %(brand)s with an existing Matrix account on a " +
|
|
||||||
"different homeserver.",
|
|
||||||
{ brand },
|
|
||||||
)}</p>
|
|
||||||
</div>
|
|
||||||
<div className="mx_Dialog_buttons">
|
|
||||||
<button onClick={this.props.onFinished} autoFocus={true}>
|
|
||||||
{ _t("Dismiss") }
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -67,7 +67,7 @@ const RegistrationEmailPromptDialog: React.FC<IProps> = ({onFinished}) => {
|
||||||
>
|
>
|
||||||
<div className="mx_Dialog_content" id="mx_RegistrationEmailPromptDialog">
|
<div className="mx_Dialog_content" id="mx_RegistrationEmailPromptDialog">
|
||||||
<p>{_t("Just a heads up, if you don't add an email and forget your password, you could " +
|
<p>{_t("Just a heads up, if you don't add an email and forget your password, you could " +
|
||||||
"<b>permanently lose access to your account.</b>", {}, {
|
"<b>permanently lose access to your account</b>.", {}, {
|
||||||
b: sub => <b>{sub}</b>,
|
b: sub => <b>{sub}</b>,
|
||||||
})}</p>
|
})}</p>
|
||||||
<form onSubmit={onSubmit}>
|
<form onSubmit={onSubmit}>
|
||||||
|
|
|
@ -125,7 +125,7 @@ export default class ServerPickerDialog extends React.PureComponent<IProps, ISta
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.props.onFinished(this.validatedConf); // TODO verify this even works
|
this.props.onFinished(this.validatedConf);
|
||||||
};
|
};
|
||||||
|
|
||||||
public render() {
|
public render() {
|
||||||
|
|
|
@ -46,7 +46,6 @@ const SSOButton: React.FC<ISSOButtonProps> = ({
|
||||||
|
|
||||||
let icon;
|
let icon;
|
||||||
if (idp && idp.icon && idp.icon.startsWith("https://")) {
|
if (idp && idp.icon && idp.icon.startsWith("https://")) {
|
||||||
// TODO sanitize images
|
|
||||||
icon = <img src={idp.icon} height="24" width="24" alt={label} />;
|
icon = <img src={idp.icon} height="24" width="24" alt={label} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,6 @@ const showPickerDialog = (
|
||||||
|
|
||||||
const onHelpClick = () => {
|
const onHelpClick = () => {
|
||||||
Modal.createTrackedDialog('Custom Server Dialog', '', InfoDialog, {
|
Modal.createTrackedDialog('Custom Server Dialog', '', InfoDialog, {
|
||||||
// TODO
|
|
||||||
title: _t("Server Options"),
|
title: _t("Server Options"),
|
||||||
description: _t("You can use the custom server options to sign into other Matrix servers by specifying " +
|
description: _t("You can use the custom server options to sign into other Matrix servers by specifying " +
|
||||||
"a different homeserver URL. This allows you to use Element with an existing Matrix account on " +
|
"a different homeserver URL. This allows you to use Element with an existing Matrix account on " +
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue