matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Tweak page URL defaulting

Browse Source
This commit is contained in:
J. Ryan Stinnett
2019-02-08 13:53:17 +00:00
parent 5ab3c8b823
commit 7a15bb65c4
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/structures/LoggedInView.js
View File

@@ -460,10 +460,11 @@ const LoggedInView = React.createClass({
case PageTypes.HomePage: case PageTypes.HomePage:
{ {
const pagesConfig = this.props.config.pages; const pagesConfig = this.props.config.pages;
let pageUrl; let pageUrl = null;
if (pagesConfig) { if (pagesConfig) {
pageUrl = pagesConfig.homeUrl; pageUrl = pagesConfig.homeUrl;
} else { }
if (!pageUrl) {
// This is a deprecated config option for the home page // This is a deprecated config option for the home page
// (despite the name, given we also now have a welcome // (despite the name, given we also now have a welcome
// page, which is not the same). // page, which is not the same).

8
src/components/views/auth/Welcome.js
View File

@@ -25,7 +25,13 @@ export default class Welcome extends React.PureComponent {
const LanguageSelector = sdk.getComponent('auth.LanguageSelector'); const LanguageSelector = sdk.getComponent('auth.LanguageSelector');
const pagesConfig = SdkConfig.get().pages; const pagesConfig = SdkConfig.get().pages;
const pageUrl = pagesConfig ? pagesConfig.welcomeUrl : 'welcome.html'; let pageUrl = null;
if (pagesConfig) {
pageUrl = pagesConfig.welcomeUrl;
}
if (!pageUrl) {
pageUrl = 'welcome.html';
}
return ( return (
<AuthPage> <AuthPage>

4
src/components/views/context_menus/TopLeftMenu.js
View File

@@ -31,8 +31,8 @@ export class TopLeftMenu extends React.Component {
hasHomePage() { hasHomePage() {
const config = SdkConfig.get(); const config = SdkConfig.get();
const pagesConfig = config.pages; const pagesConfig = config.pages;
if (pagesConfig) { if (pagesConfig && pagesConfig.homeUrl) {
return !!pagesConfig.homeUrl; return true;
} }
// This is a deprecated config option for the home page // This is a deprecated config option for the home page
// (despite the name, given we also now have a welcome // (despite the name, given we also now have a welcome