discard create-react-class, no point using it here. use React.FC

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/10480/head
Michael Telatynski 2019-08-06 18:22:11 +01:00
parent 06e7a48aaf
commit da9f1d1fa3
3 changed files with 57 additions and 68 deletions

View File

@ -68,7 +68,6 @@
"babel-runtime": "^6.26.0", "babel-runtime": "^6.26.0",
"bluebird": "^3.5.2", "bluebird": "^3.5.2",
"browser-request": "^0.3.3", "browser-request": "^0.3.3",
"create-react-class": "^15.6.0",
"draft-js": "^0.11.0-alpha", "draft-js": "^0.11.0-alpha",
"extract-text-webpack-plugin": "^4.0.0-beta.0", "extract-text-webpack-plugin": "^4.0.0-beta.0",
"favico.js": "^0.3.10", "favico.js": "^0.3.10",

View File

@ -16,43 +16,38 @@ limitations under the License.
*/ */
import React from 'react'; import React from 'react';
import createReactClass from 'create-react-class';
import SdkConfig from 'matrix-react-sdk/lib/SdkConfig'; import SdkConfig from 'matrix-react-sdk/lib/SdkConfig';
import { _t } from 'matrix-react-sdk/lib/languageHandler'; import { _t } from 'matrix-react-sdk/lib/languageHandler';
module.exports = createReactClass({ module.exports = () => {
displayName: 'VectorAuthFooter', const brandingConfig = SdkConfig.get().branding;
statics: { let links = [
replaces: 'AuthFooter', {"text": "blog", "url": "https://medium.com/@RiotChat"},
}, {"text": "twitter", "url": "https://twitter.com/@RiotChat"},
{"text": "github", "url": "https://github.com/vector-im/riot-web"},
];
render: function() { if (brandingConfig && brandingConfig.authFooterLinks) {
const brandingConfig = SdkConfig.get().branding; links = brandingConfig.authFooterLinks;
let links = [ }
{"text": "blog", "url": "https://medium.com/@RiotChat"},
{"text": "twitter", "url": "https://twitter.com/@RiotChat"},
{"text": "github", "url": "https://github.com/vector-im/riot-web"},
];
if (brandingConfig && brandingConfig.authFooterLinks) { const authFooterLinks = [];
links = brandingConfig.authFooterLinks; for (const linkEntry of links) {
} authFooterLinks.push(
<a href={linkEntry.url} key={linkEntry.text} target="_blank" rel="noopener">
const authFooterLinks = []; {linkEntry.text}
for (const linkEntry of links) { </a>,
authFooterLinks.push(
<a href={linkEntry.url} key={linkEntry.text} target="_blank" rel="noopener">
{linkEntry.text}
</a>,
);
}
return (
<div className="mx_AuthFooter">
{authFooterLinks}
<a href="https://matrix.org" target="_blank" rel="noopener">{ _t('powered by Matrix') }</a>
</div>
); );
}, }
});
return (
<div className="mx_AuthFooter">
{authFooterLinks}
<a href="https://matrix.org" target="_blank" rel="noopener">{ _t('powered by Matrix') }</a>
</div>
);
};
module.exports.statics = {
replaces: 'AuthFooter',
};

View File

@ -16,44 +16,39 @@ limitations under the License.
*/ */
import React from "react"; import React from "react";
import createReactClass from 'create-react-class';
import { _t } from 'matrix-react-sdk/lib/languageHandler'; import { _t } from 'matrix-react-sdk/lib/languageHandler';
/** /**
* This is identical to `CustomServerDialog` except for replacing "this app" * This is identical to `CustomServerDialog` except for replacing "this app"
* with "Riot". * with "Riot".
*/ */
module.exports = createReactClass({ module.exports = () => {
displayName: 'VectorCustomServerDialog', return (
statics: { <div className="mx_ErrorDialog">
replaces: 'CustomServerDialog', <div className="mx_Dialog_title">
}, { _t('Custom Server Options') }
render: function() {
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 Riot with an existing Matrix account on a " +
"different homeserver.",
)}</p>
<p>{_t(
"You can also set a custom identity server, but you won't be " +
"able to invite users by email address, or be invited by email " +
"address yourself.",
)}</p>
</div>
<div className="mx_Dialog_buttons">
<button onClick={this.props.onFinished} autoFocus={true}>
{ _t('Dismiss') }
</button>
</div>
</div> </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 Riot with an existing Matrix account on a " +
"different homeserver.",
)}</p>
<p>{_t(
"You can also set a custom identity server, but you won't be " +
"able to invite users by email address, or be invited by email " +
"address yourself.",
)}</p>
</div>
<div className="mx_Dialog_buttons">
<button onClick={this.props.onFinished} autoFocus={true}>
{ _t('Dismiss') }
</button>
</div>
</div>
);
};
module.exports.statics = {
replaces: 'CustomServerDialog',
};