mirror of
https://github.com/element-hq/element-web
synced 2024-11-27 11:47:23 +03:00
Remove the white screen of welcome
If there's no home page configured, view the first room.
This commit is contained in:
parent
53ead43e2b
commit
e5e355ed2d
3 changed files with 39 additions and 12 deletions
|
@ -31,6 +31,7 @@ import sessionStore from '../../stores/SessionStore';
|
||||||
import MatrixClientPeg from '../../MatrixClientPeg';
|
import MatrixClientPeg from '../../MatrixClientPeg';
|
||||||
import SettingsStore from "../../settings/SettingsStore";
|
import SettingsStore from "../../settings/SettingsStore";
|
||||||
import RoomListStore from "../../stores/RoomListStore";
|
import RoomListStore from "../../stores/RoomListStore";
|
||||||
|
import { getHomePageUrl } from '../../utils/pages';
|
||||||
|
|
||||||
import TagOrderActions from '../../actions/TagOrderActions';
|
import TagOrderActions from '../../actions/TagOrderActions';
|
||||||
import RoomListActions from '../../actions/RoomListActions';
|
import RoomListActions from '../../actions/RoomListActions';
|
||||||
|
@ -459,17 +460,7 @@ const LoggedInView = React.createClass({
|
||||||
|
|
||||||
case PageTypes.HomePage:
|
case PageTypes.HomePage:
|
||||||
{
|
{
|
||||||
const pagesConfig = this.props.config.embeddedPages;
|
const pageUrl = getHomePageUrl(this.props.config);
|
||||||
let pageUrl = null;
|
|
||||||
if (pagesConfig) {
|
|
||||||
pageUrl = pagesConfig.homeUrl;
|
|
||||||
}
|
|
||||||
if (!pageUrl) {
|
|
||||||
// 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"
|
pageElement = <EmbeddedPage className="mx_HomePage"
|
||||||
url={pageUrl}
|
url={pageUrl}
|
||||||
scrollbar={true}
|
scrollbar={true}
|
||||||
|
|
|
@ -40,6 +40,7 @@ import * as Lifecycle from '../../Lifecycle';
|
||||||
// LifecycleStore is not used but does listen to and dispatch actions
|
// LifecycleStore is not used but does listen to and dispatch actions
|
||||||
require('../../stores/LifecycleStore');
|
require('../../stores/LifecycleStore');
|
||||||
import PageTypes from '../../PageTypes';
|
import PageTypes from '../../PageTypes';
|
||||||
|
import { getHomePageUrl } from '../../utils/pages';
|
||||||
|
|
||||||
import createRoom from "../../createRoom";
|
import createRoom from "../../createRoom";
|
||||||
import KeyRequestHandler from '../../KeyRequestHandler';
|
import KeyRequestHandler from '../../KeyRequestHandler';
|
||||||
|
@ -1198,8 +1199,12 @@ export default React.createClass({
|
||||||
} else {
|
} else {
|
||||||
if (MatrixClientPeg.get().isGuest()) {
|
if (MatrixClientPeg.get().isGuest()) {
|
||||||
dis.dispatch({action: 'view_welcome_page'});
|
dis.dispatch({action: 'view_welcome_page'});
|
||||||
} else {
|
} else if (getHomePageUrl(this.props.config)){
|
||||||
dis.dispatch({action: 'view_home_page'});
|
dis.dispatch({action: 'view_home_page'});
|
||||||
|
} else {
|
||||||
|
this.firstSyncPromise.promise.then(() => {
|
||||||
|
dis.dispatch({action: 'view_next_room'});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
31
src/utils/pages.js
Normal file
31
src/utils/pages.js
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
/*
|
||||||
|
Copyright 2019 New Vector Ltd
|
||||||
|
|
||||||
|
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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export function getHomePageUrl(appConfig) {
|
||||||
|
const pagesConfig = appConfig.embeddedPages;
|
||||||
|
let pageUrl = null;
|
||||||
|
if (pagesConfig) {
|
||||||
|
pageUrl = pagesConfig.homeUrl;
|
||||||
|
}
|
||||||
|
if (!pageUrl) {
|
||||||
|
// 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 = appConfig.welcomePageUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
return pageUrl;
|
||||||
|
}
|
Loading…
Reference in a new issue