matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-17 17:42:41 +03:00
Code Activity

fix m.federate=false warning in room settings

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2017-08-02 13:42:24 +01:00
parent 4b4b730233
commit e9afcec5b2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -408,11 +408,12 @@ module.exports = React.createClass({
_yankValueFromEvent: function(stateEventType, keyName, defaultValue) { _yankValueFromEvent: function(stateEventType, keyName, defaultValue) {
// E.g.("m.room.name","name") would yank the "name" content key from "m.room.name" // E.g.("m.room.name","name") would yank the "name" content key from "m.room.name"
var event = this.props.room.currentState.getStateEvents(stateEventType, ''); const event = this.props.room.currentState.getStateEvents(stateEventType, '');
if (!event) { if (!event) {
return defaultValue; return defaultValue;
} }
return event.getContent()[keyName] || defaultValue; const content = event.getContent();
return keyName in content ? content[keyName] : defaultValue;
}, },
_onHistoryRadioToggle: function(ev) { _onHistoryRadioToggle: function(ev) {
@@ -704,7 +705,7 @@ module.exports = React.createClass({
} }
var unfederatableSection; var unfederatableSection;
if (this._yankValueFromEvent("m.room.create", "m.federate") === false) { if (this._yankValueFromEvent("m.room.create", "m.federate", true) === false) {
unfederatableSection = ( unfederatableSection = (
<div className="mx_RoomSettings_powerLevel"> <div className="mx_RoomSettings_powerLevel">
{ _t('This room is not accessible by remote Matrix servers') }. { _t('This room is not accessible by remote Matrix servers') }.