imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove labs flag for custom notif sounds

Browse source
This commit is contained in:
Will Hunt 2019-06-03 17:35:15 +01:00
parent 96c20ea536
commit 300095f50f
6 changed files with 9 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/views/dialogs/RoomSettingsDialog.js
View file

@ -70,13 +70,11 @@ export default class RoomSettingsDialog extends React.Component {
<RolesRoomSettingsTab roomId={this.props.roomId} />,
));
if (SettingsStore.isFeatureEnabled("feature_notification_sounds")) {
tabs.push(new Tab(
_td("Notifications"),
"mx_RoomSettingsDialog_rolesIcon",
<NotificationSettingsTab roomId={this.props.roomId} />,
));
}
tabs.push(new Tab(
_td("Notifications"),
"mx_RoomSettingsDialog_rolesIcon",
<NotificationSettingsTab roomId={this.props.roomId} />,
));
tabs.push(new Tab(
_td("Advanced"),

4
src/components/views/settings/tabs/room/NotificationSettingsTab.js
View file

@ -85,7 +85,7 @@ export default class NotificationsSettingsTab extends React.Component {
if (!this.state.uploadedFile) {
return;
}
let type = this.state.uploadedFile.type;
if (type === "video/ogg") {
// XXX: I've observed browsers allowing users to pick a audio/ogg files,
@ -149,7 +149,7 @@ export default class NotificationsSettingsTab extends React.Component {
<div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
<span className='mx_SettingsTab_subheading'>{_t("Sounds")}</span>
<div>
<span>{_t("Notification sound")}: <code>{this.state.currentSound}</code></span><br/>
<span>{_t("Notification sound")}: <code>{this.state.currentSound}</code></span><br />
<AccessibleButton className="mx_NotificationSound_resetSound" disabled={this.state.currentSound == "default"} onClick={this._clearSound.bind(this)} kind="primary">
{_t("Reset")}
</AccessibleButton>