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

Remove redundant setState call, always focus composer after sync

pull/21833/head
Luke Barnard 2017-04-06 11:44:15 +01:00
parent 95b40a976c
commit 5f8a7b46a8
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/structures/MatrixChat.js
View File

@ -644,7 +644,7 @@ module.exports = React.createClass({
// Wait for the first sync to complete so that if a room does have an alias, // Wait for the first sync to complete so that if a room does have an alias,
// it would have been retrieved. // it would have been retrieved.
let waitFor = q(null); let waitFor = q(null);
if (!firstSyncComplete) { if (!this.firstSyncComplete) {
if (!this.firstSyncPromise) { if (!this.firstSyncPromise) {
console.warn('Cannot view a room before first sync. room_id:', room_info.room_id); console.warn('Cannot view a room before first sync. room_id:', room_info.room_id);
return; return;
@ -851,13 +851,8 @@ module.exports = React.createClass({
self.firstSyncComplete = true; self.firstSyncComplete = true;
self.firstSyncPromise.resolve(); self.firstSyncPromise.resolve();
if (!self.state.page_type) { dis.dispatch({action: 'focus_composer'});
// Switch to room view but allow _onLoggedIn to specify a room (if any) self.setState({ready: true});
self.setState({ready: true});
dis.dispatch({action: 'focus_composer'});
} else {
self.setState({ready: true});
}
}); });
cli.on('Call.incoming', function(call) { cli.on('Call.incoming', function(call) {
dis.dispatch({ dis.dispatch({