mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 11:47:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use separate config settings for each page

Browse source
This commit is contained in:
J. Ryan Stinnett 2019-02-07 17:16:02 +00:00
parent 7cc38f9d96
commit c587dcab92
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/structures/LoggedInView.js
View file

@ -459,8 +459,18 @@ const LoggedInView = React.createClass({
case PageTypes.HomePage:
{
const pagesConfig = this.props.config.pages;
let pageUrl;
if (pagesConfig) {
pageUrl = pagesConfig.homeUrl;
} else {
// This is a deprecated config option for the home page
// (despite the name, given we also now have a welcome
// page, which is not the same).
pageUrl = this.props.config.welcomePageUrl;
}
pageElement = <EmbeddedPage className="mx_HomePage"
url={this.props.config.welcomePageUrl || 'home.html'}
url={pageUrl}
scrollbar={true}
/>;
}

5
src/components/views/auth/Welcome.js
View file

@ -25,12 +25,15 @@ export default class Welcome extends React.PureComponent {
const AuthBody = sdk.getComponent("auth.AuthBody");
const EmbeddedPage = sdk.getComponent('structures.EmbeddedPage');
const pagesConfig = SdkConfig.get().pages;
const pageUrl = pagesConfig ? pagesConfig.welcomeUrl : 'welcome.html';
return (
<AuthPage>
<AuthHeader />
<AuthBody>
<EmbeddedPage className="mx_WelcomePage"
url={SdkConfig.get().welcomePageUrl || 'home.html'}
url={pageUrl}
/>
</AuthBody>
</AuthPage>