From 225695ab5c8f597252bf4b793ce88e2f22d73766 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 12 Dec 2019 19:33:08 -0700 Subject: [PATCH] Fix exports for rate limited functions and MatrixClientPeg MatrixClientPeg in particular doesn't work very well with this. --- src/MatrixClientPeg.js | 5 +++-- src/components/structures/RoomView.js | 2 +- src/components/views/rooms/MemberList.js | 4 ++-- src/components/views/rooms/RoomList.js | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js index 51ac7acb37..4d293b7e34 100644 --- a/src/MatrixClientPeg.js +++ b/src/MatrixClientPeg.js @@ -48,7 +48,7 @@ interface MatrixClientCreds { * This module provides a singleton instance of this class so the 'current' * Matrix Client object is available easily. */ -class MatrixClientPeg { +class _MatrixClientPeg { constructor() { this.matrixClient = null; this._justRegisteredUserId = null; @@ -245,6 +245,7 @@ class MatrixClientPeg { } if (!global.mxMatrixClientPeg) { - global.mxMatrixClientPeg = new MatrixClientPeg(); + global.mxMatrixClientPeg = new _MatrixClientPeg(); } export default global.mxMatrixClientPeg; +export const MatrixClientPeg = global.mxMatrixClientPeg; diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index d78c9923c2..2f8d274866 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -887,7 +887,7 @@ module.exports = createReactClass({ // rate limited because a power level change will emit an event for every // member in the room. - _updateRoomMembers: new rate_limited_func(function(dueToMember) { + _updateRoomMembers: rate_limited_func(function(dueToMember) { // a member state changed in this room // refresh the conf call notification state this._updateConfCallNotification(); diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js index 0805c0342c..05464b43c9 100644 --- a/src/components/views/rooms/MemberList.js +++ b/src/components/views/rooms/MemberList.js @@ -23,9 +23,9 @@ import SdkConfig from '../../../SdkConfig'; import dis from '../../../dispatcher'; import AutoHideScrollbar from "../../structures/AutoHideScrollbar"; import {isValid3pidInvite} from "../../../RoomInvite"; +import rate_limited_func from "../../../ratelimitedfunc"; const MatrixClientPeg = require("../../../MatrixClientPeg"); const sdk = require('../../../index'); -const rate_limited_func = require('../../../ratelimitedfunc'); const CallHandler = require("../../../CallHandler"); const INITIAL_LOAD_NUM_MEMBERS = 30; @@ -187,7 +187,7 @@ module.exports = createReactClass({ } }, - _updateList: new rate_limited_func(function() { + _updateList: rate_limited_func(function() { this._updateListNow(); }, 500), diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index 80a03e7a73..210c9394dc 100644 --- a/src/components/views/rooms/RoomList.js +++ b/src/components/views/rooms/RoomList.js @@ -27,7 +27,7 @@ const MatrixClientPeg = require("../../../MatrixClientPeg"); const CallHandler = require('../../../CallHandler'); const dis = require("../../../dispatcher"); const sdk = require('../../../index'); -const rate_limited_func = require('../../../ratelimitedfunc'); +import rate_limited_func from "../../../ratelimitedfunc"; import * as Rooms from '../../../Rooms'; import DMRoomMap from '../../../utils/DMRoomMap'; const Receipt = require('../../../utils/Receipt'); @@ -384,7 +384,7 @@ module.exports = createReactClass({ this._delayedRefreshRoomList(); }, - _delayedRefreshRoomList: new rate_limited_func(function() { + _delayedRefreshRoomList: rate_limited_func(function() { this.refreshRoomList(); }, 500),