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

Don't auto join rooms: always 'autoPeek' (ie. see if we can peek, otherwise offer to join)

Browse source
This commit is contained in:
David Baker 2016-02-02 15:50:15 +00:00
parent 4e4e5be9a1
commit 1cabe2ec37
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/components/structures/MatrixChat.js
View file

@ -66,7 +66,6 @@ module.exports = React.createClass({
collapse_rhs: false, collapse_rhs: false,
ready: false, ready: false,
width: 10000, width: 10000,
autoPeek: true, // by default, we peek into rooms when we try to join them
}; };
if (s.logged_in) { if (s.logged_in) {
if (MatrixClientPeg.get().getRooms().length) { if (MatrixClientPeg.get().getRooms().length) {
@ -317,9 +316,6 @@ module.exports = React.createClass({
}); });
break; break;
case 'view_room': case 'view_room':
// by default we autoPeek rooms, unless we were called explicitly with
// autoPeek=false by something like RoomDirectory who has already peeked
this.setState({ autoPeek : payload.auto_peek === false ? false : true });
this._viewRoom(payload.room_id, payload.show_settings); this._viewRoom(payload.room_id, payload.show_settings);
break; break;
case 'view_prev_room': case 'view_prev_room':
@ -843,7 +839,6 @@ module.exports = React.createClass({
<RoomView <RoomView
ref="roomView" ref="roomView"
roomId={this.state.currentRoom} roomId={this.state.currentRoom}
autoPeek={this.state.autoPeek}
key={this.state.currentRoom} key={this.state.currentRoom}
ConferenceHandler={this.props.ConferenceHandler} /> ConferenceHandler={this.props.ConferenceHandler} />
); );

8
src/components/structures/RoomView.js
View file

@ -59,7 +59,13 @@ module.exports = React.createClass({
propTypes: { propTypes: {
ConferenceHandler: React.PropTypes.any, ConferenceHandler: React.PropTypes.any,
roomId: React.PropTypes.string, roomId: React.PropTypes.string,
autoPeek: React.PropTypes.bool, // should we try to peek the room on mount, or has whoever invoked us already initiated a peek? autoPeek: React.PropTypes.bool, // Now unused, left here temporarily to avoid merge conflicts with @richvdh's branch.
},
getDefaultProps: function() {
return {
autoPeek: true,
}
}, },
/* properties in RoomView objects include: /* properties in RoomView objects include: