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

Remove the mute toggle from room settings 

As it now incorrectly represents the mute as a binary toggle rather than a quad-state
pull/21833/head
David Baker 2016-08-17 18:50:34 +01:00
parent 87f94bde62
commit dd088794c2
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/views/rooms/RoomSettings.js
View File

@ -47,16 +47,6 @@ module.exports = React.createClass({
tags[tagName] = ['yep']; tags[tagName] = ['yep'];
}); });
var areNotifsMuted = false;
if (!MatrixClientPeg.get().isGuest()) {
var roomPushRule = MatrixClientPeg.get().getRoomPushRule("global", this.props.room.roomId);
if (roomPushRule) {
if (0 <= roomPushRule.actions.indexOf("dont_notify")) {
areNotifsMuted = true;
}
}
}
return { return {
name: this._yankValueFromEvent("m.room.name", "name"), name: this._yankValueFromEvent("m.room.name", "name"),
topic: this._yankValueFromEvent("m.room.topic", "topic"), topic: this._yankValueFromEvent("m.room.topic", "topic"),
@ -66,7 +56,6 @@ module.exports = React.createClass({
power_levels_changed: false, power_levels_changed: false,
tags_changed: false, tags_changed: false,
tags: tags, tags: tags,
areNotifsMuted: areNotifsMuted,
// isRoomPublished is loaded async in componentWillMount so when the component // isRoomPublished is loaded async in componentWillMount so when the component
// inits, the saved value will always be undefined, however getInitialState() // inits, the saved value will always be undefined, however getInitialState()
// is also called from the saving code so we must return the correct value here // is also called from the saving code so we must return the correct value here
@ -188,12 +177,6 @@ module.exports = React.createClass({
} }
if (this.state.areNotifsMuted !== originalState.areNotifsMuted) {
promises.push(MatrixClientPeg.get().setRoomMutePushRule(
"global", roomId, this.state.areNotifsMuted
));
}
// power levels // power levels
var powerLevels = this._getPowerLevels(); var powerLevels = this._getPowerLevels();
if (powerLevels) { if (powerLevels) {
@ -647,12 +630,6 @@ module.exports = React.createClass({
{ tagsSection } { tagsSection }
<div className="mx_RoomSettings_toggles"> <div className="mx_RoomSettings_toggles">
<label>
<input type="checkbox" disabled={ cli.isGuest() }
onChange={this._onToggle.bind(this, "areNotifsMuted", true, false)}
defaultChecked={this.state.areNotifsMuted}/>
'Mention only' notifications for this room
</label>
<div className="mx_RoomSettings_settings"> <div className="mx_RoomSettings_settings">
<h3>Who can access this room?</h3> <h3>Who can access this room?</h3>
{ inviteGuestWarning } { inviteGuestWarning }