PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
David Baker 2017-09-14 23:09:26 +01:00
commit f3a4856593
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Invite.js
View file

@ -127,7 +127,7 @@ function _onRoomInviteFinished(roomId, shouldInvite, addrs) {
} }
function _isDmChat(addrTexts) { function _isDmChat(addrTexts) {
if (addrTexts.length === 1 && getAddressType(addrTexts[0])) { if (addrTexts.length === 1 && getAddressType(addrTexts[0]) === 'mx') {
return true; return true;
} else { } else {
return false; return false;

2
src/components/views/rooms/RoomHeader.js
View file

@ -56,7 +56,7 @@ module.exports = React.createClass({
editing: false, editing: false,
inRoom: false, inRoom: false,
onSaveClick: function() {}, onSaveClick: function() {},
onCancelClick: function() {}, onCancelClick: null,
}; };
}, },

1
src/stores/RoomViewStore.js
View file

@ -158,6 +158,7 @@ class RoomViewStore extends Store {
highlighted: payload.highlighted, highlighted: payload.highlighted,
room_alias: payload.room_alias, room_alias: payload.room_alias,
auto_join: payload.auto_join, auto_join: payload.auto_join,
oob_data: payload.oob_data,
}); });
}, (err) => { }, (err) => {
dis.dispatch({ dis.dispatch({