Merge pull request #1145 from matrix-org/luke/fix-rte-tab-complete-after-join
Update tab-complete state onRoom received after joining
This commit is contained in:
commit
7998602f42
1 changed files with 2 additions and 2 deletions
|
@ -234,8 +234,6 @@ module.exports = React.createClass({
|
||||||
// making it impossible to indicate a newly joined room.
|
// making it impossible to indicate a newly joined room.
|
||||||
const room = this.state.room;
|
const room = this.state.room;
|
||||||
if (room) {
|
if (room) {
|
||||||
UserProvider.getInstance().setUserListFromRoom(room);
|
|
||||||
this.tabComplete.loadEntries(room);
|
|
||||||
this.setState({
|
this.setState({
|
||||||
unsentMessageError: this._getUnsentMessageError(room),
|
unsentMessageError: this._getUnsentMessageError(room),
|
||||||
});
|
});
|
||||||
|
@ -523,6 +521,8 @@ module.exports = React.createClass({
|
||||||
this._warnAboutEncryption(room);
|
this._warnAboutEncryption(room);
|
||||||
this._calculatePeekRules(room);
|
this._calculatePeekRules(room);
|
||||||
this._updatePreviewUrlVisibility(room);
|
this._updatePreviewUrlVisibility(room);
|
||||||
|
this.tabComplete.loadEntries(room);
|
||||||
|
UserProvider.getInstance().setUserListFromRoom(room);
|
||||||
},
|
},
|
||||||
|
|
||||||
_warnAboutEncryption: function(room) {
|
_warnAboutEncryption: function(room) {
|
||||||
|
|
Loading…
Reference in a new issue