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

Don't throw exceptions when room changes in a timelinepanel

Browse source 
This does happen - fortunately only in circumstances where it's not a
problem. Downgrade the exception to a warning.

Fixes https://github.com/vector-im/vector-web/issues/1036
This commit is contained in:
Richard van der Hoff 2016-02-26 22:38:05 +00:00
parent 543f444174
commit acfc7b3719
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/structures/TimelinePanel.js
View file

@ -124,7 +124,18 @@ var TimelinePanel = React.createClass({
componentWillReceiveProps: function(newProps) { componentWillReceiveProps: function(newProps) {
if (newProps.room !== this.props.room) { if (newProps.room !== this.props.room) {
throw new Error("changing room on a TimelinePanel is not supported"); // throw new Error("changing room on a TimelinePanel is not supported");
// regrettably, this does happen; in particular, when joining a
// room with /join. In that case, there are two Rooms in
// circulation - one which is created by the MatrixClient.joinRoom
// call and used to create the RoomView, and a second which is
// created by the sync loop once the room comes back down the /sync
// pipe. Once the latter happens, our room is replaced with the new one.
//
// for now, just warn about this. But we're going to end up paginating
// both rooms separately, and it's all bad.
console.warn("Replacing room on a TimelinePanel - confusion may ensue");
} }
if (newProps.eventId != this.props.eventId) { if (newProps.eventId != this.props.eventId) {