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

Revert "unbreak stack overflow which fires on tests due to mocked timers" 

This reverts commit e69ea68133.
pull/21833/head
David Baker 2017-05-16 16:02:13 +01:00
parent eddc2af92d
commit 67c6a8b81d
1 changed files with 2 additions and 8 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,11 +74,7 @@ module.exports = React.createClass({
this.setState(s);
// order of the sublists
//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
this.listOrder = [];
},
componentDidMount: function() {
@ -288,12 +284,10 @@ module.exports = React.createClass({
// if the mouse has been moving over the RoomList in the last 500ms
// then delay the refresh further to avoid bouncing around under the
// cursor
if (Date.now() - this._lastMouseOverTs > 500 || this._delayedRefreshRoomListLoopCount > 60) {
if (Date.now() - this._lastMouseOverTs > 500) {
this.refreshRoomList();
this._delayedRefreshRoomListLoopCount = 0;
}
else {
this._delayedRefreshRoomListLoopCount++;
this._delayedRefreshRoomList();
}
}, 500),