mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 12:28:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2018-06-04 15:40:03 +00:00
commit 21e4ee5901
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/structures/MatrixChat.js
View file

@ -398,6 +398,9 @@ export default React.createClass({
}, },
startPageChangeTimer() { startPageChangeTimer() {
// Tor doesn't support performance
if (!performance || !performance.mark) return null;
// This shouldn't happen because componentWillUpdate and componentDidUpdate // This shouldn't happen because componentWillUpdate and componentDidUpdate
// are used. // are used.
if (this._pageChanging) { if (this._pageChanging) {
@ -409,6 +412,9 @@ export default React.createClass({
}, },
stopPageChangeTimer() { stopPageChangeTimer() {
// Tor doesn't support performance
if (!performance || !performance.mark) return null;
if (!this._pageChanging) { if (!this._pageChanging) {
console.warn('MatrixChat.stopPageChangeTimer: timer not started'); console.warn('MatrixChat.stopPageChangeTimer: timer not started');
return; return;