Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-18 06:35:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Weblate 2018-02-05 10:21:10 +00:00
commit 5ddb0b9b4b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/room_settings/AliasSettings.js
View File

@ -58,8 +58,8 @@ module.exports = React.createClass({
state.domainToAliases = this.aliasEventsToDictionary(aliasEvents); state.domainToAliases = this.aliasEventsToDictionary(aliasEvents);
state.remoteDomains = Object.keys(state.domainToAliases).filter((alias) => { state.remoteDomains = Object.keys(state.domainToAliases).filter((domain) => {
return alias !== localDomain; return domain !== localDomain && state.domainToAliases[domain].length > 0;
}); });
if (canonicalAliasEvent) { if (canonicalAliasEvent) {

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

@ -774,7 +774,8 @@ module.exports = React.createClass({
const aliasEvents = this.props.room.currentState.getStateEvents('m.room.aliases') || []; const aliasEvents = this.props.room.currentState.getStateEvents('m.room.aliases') || [];
let aliasCount = 0; let aliasCount = 0;
aliasEvents.forEach((event) => { aliasEvents.forEach((event) => {
aliasCount += event.getContent().aliases.length; const aliases = event.getContent().aliases || [];
aliasCount += aliases.length;
}); });
if (this.state.join_rule === "public" && aliasCount == 0) { if (this.state.join_rule === "public" && aliasCount == 0) {