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

unbreak stack overflow which fires on tests due to mocked timers

Browse source
This commit is contained in:
Matthew Hodgson 2017-04-20 13:53:36 +01:00
parent 0ad1d8caf3
commit e69ea68133
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/views/rooms/RoomList.js
View file

@ -74,7 +74,11 @@ module.exports = React.createClass({
this.setState(s); this.setState(s);
// order of the sublists // order of the sublists
this.listOrder = []; //this.listOrder = [];
// loop count to stop a stack overflow if the user keeps waggling the
// mouse for >30s in a row, or if running under mocha
this._delayedRefreshRoomListLoopCount = 0
}, },
componentDidMount: function() { componentDidMount: function() {
@ -284,10 +288,12 @@ module.exports = React.createClass({
// if the mouse has been moving over the RoomList in the last 500ms // if the mouse has been moving over the RoomList in the last 500ms
// then delay the refresh further to avoid bouncing around under the // then delay the refresh further to avoid bouncing around under the
// cursor // cursor
if (Date.now() - this._lastMouseOverTs > 500) { if (Date.now() - this._lastMouseOverTs > 500 || this._delayedRefreshRoomListLoopCount > 60) {
this.refreshRoomList(); this.refreshRoomList();
this._delayedRefreshRoomListLoopCount = 0;
} }
else { else {
this._delayedRefreshRoomListLoopCount++;
this._delayedRefreshRoomList(); this._delayedRefreshRoomList();
} }
}, 500), }, 500),