OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Use IncompatibleController to disable showLocation via labs flag (#7566)

pull/21833/head
Andy Balaam 2022-01-18 11:28:23 +00:00 committed by GitHub
parent a2f09480ee
commit e1cdbe1e54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/views/rooms/MessageComposer.tsx
View File

@ -286,10 +286,7 @@ export default class MessageComposer extends React.Component<IProps, IState> {
showStickers: false, showStickers: false,
showStickersButton: SettingsStore.getValue("MessageComposerInput.showStickersButton"), showStickersButton: SettingsStore.getValue("MessageComposerInput.showStickersButton"),
showPollsButton: SettingsStore.getValue("feature_polls"), showPollsButton: SettingsStore.getValue("feature_polls"),
showLocationButton: ( showLocationButton: SettingsStore.getValue("MessageComposerInput.showLocationButton"),
SettingsStore.getValue("feature_location_share") &&
SettingsStore.getValue("MessageComposerInput.showLocationButton")
),
}; };
this.instanceId = instanceCount++; this.instanceId = instanceCount++;
@ -354,12 +351,9 @@ export default class MessageComposer extends React.Component<IProps, IState> {
case "MessageComposerInput.showLocationButton": case "MessageComposerInput.showLocationButton":
case "feature_location_share": { case "feature_location_share": {
const showLocationButton = ( const showLocationButton = SettingsStore.getValue(
SettingsStore.getValue("feature_location_share") && "MessageComposerInput.showLocationButton");
SettingsStore.getValue(
"MessageComposerInput.showLocationButton",
)
);
if (this.state.showLocationButton !== showLocationButton) { if (this.state.showLocationButton !== showLocationButton) {
this.setState({ showLocationButton }); this.setState({ showLocationButton });
} }

2
src/settings/Settings.tsx
View File

@ -418,7 +418,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
supportedLevels: LEVELS_ACCOUNT_SETTINGS, supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Enable location sharing'), displayName: _td('Enable location sharing'),
default: true, default: true,
controller: new UIFeatureController(UIFeature.Widgets, false), controller: new IncompatibleController("feature_location_share", false, false),
}, },
// TODO: Wire up appropriately to UI (FTUE notifications) // TODO: Wire up appropriately to UI (FTUE notifications)
"Notifications.alwaysShowBadgeCounts": { "Notifications.alwaysShowBadgeCounts": {