mirror of
https://github.com/vector-im/element-web.git
synced 2024-11-17 22:14:58 +08:00
Merge pull request #1105 from matrix-org/dbkr/fix_url_previews
Fix URL previews
This commit is contained in:
commit
56eb71d19f
@ -230,6 +230,10 @@ module.exports = React.createClass({
|
|||||||
if (room) {
|
if (room) {
|
||||||
this._updateAutoComplete(room);
|
this._updateAutoComplete(room);
|
||||||
this.tabComplete.loadEntries(room);
|
this.tabComplete.loadEntries(room);
|
||||||
|
this.setState({
|
||||||
|
unsentMessageError: this._getUnsentMessageError(room),
|
||||||
|
});
|
||||||
|
this._onRoomLoaded(room);
|
||||||
}
|
}
|
||||||
if (!this.state.joining && this.state.roomId) {
|
if (!this.state.joining && this.state.roomId) {
|
||||||
if (this.props.autoJoin) {
|
if (this.props.autoJoin) {
|
||||||
@ -262,10 +266,6 @@ module.exports = React.createClass({
|
|||||||
} else if (room) {
|
} else if (room) {
|
||||||
// Stop peeking because we have joined this room previously
|
// Stop peeking because we have joined this room previously
|
||||||
MatrixClientPeg.get().stopPeeking();
|
MatrixClientPeg.get().stopPeeking();
|
||||||
this.setState({
|
|
||||||
unsentMessageError: this._getUnsentMessageError(room),
|
|
||||||
});
|
|
||||||
this._onRoomLoaded(room);
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user