PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Support a config option to change the default device name (#20790)

Browse source
This commit is contained in:
Travis Ralston 2022-01-28 08:52:43 -07:00 committed by GitHub
parent cfa97212f7
commit 7078373fbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/config.md
View file

@ -166,6 +166,8 @@ For a good example, see https://develop.element.io/config.json.
the well-known location is used instead. the well-known location is used instead.
1. `analyticsOwner`: The entity that analytics data is being sent to. Used in copy 1. `analyticsOwner`: The entity that analytics data is being sent to. Used in copy
when explaining to the user where data is being sent. If not set, defaults to `brand`. when explaining to the user where data is being sent. If not set, defaults to `brand`.
1. `defaultDeviceDisplayName`: The default device display name to use for new logins
and registrations. If not set then a calculated version will be used.
Note that `index.html` also has an og:image meta tag that is set to an image Note that `index.html` also has an og:image meta tag that is set to an image
hosted on riot.im. This is the image used if links to your copy of Element hosted on riot.im. This is the image used if links to your copy of Element

4
src/vector/app.tsx
View file

@ -180,6 +180,8 @@ export async function loadApp(fragParams: {}) {
return; return;
} }
const defaultDeviceName = config['defaultDeviceDisplayName'] ?? platform.getDefaultDeviceDisplayName();
const MatrixChat = sdk.getComponent('structures.MatrixChat'); const MatrixChat = sdk.getComponent('structures.MatrixChat');
return <MatrixChat return <MatrixChat
onNewScreen={onNewScreen} onNewScreen={onNewScreen}
@ -190,7 +192,7 @@ export async function loadApp(fragParams: {}) {
enableGuest={!config.disable_guests} enableGuest={!config.disable_guests}
onTokenLoginCompleted={onTokenLoginCompleted} onTokenLoginCompleted={onTokenLoginCompleted}
initialScreenAfterLogin={getScreenFromLocation(window.location)} initialScreenAfterLogin={getScreenFromLocation(window.location)}
defaultDeviceDisplayName={platform.getDefaultDeviceDisplayName()} defaultDeviceDisplayName={defaultDeviceName}
/>; />;
} }