matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity

Merge pull request #716 from matrix-org/bwindels/fixfilepanel

Browse Source 
Fix filepanel also filtering main timeline with LL turned on.
This commit is contained in:
Bruno Windels
2018-09-04 17:10:49 +02:00
committed by GitHub
parent a6c055b6d1 0d24c18fed
commit 3561fd1c05
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.js
View File

@@ -2145,7 +2145,9 @@ function(roomId, fromToken, limit, dir, timelineFilter = undefined) {
let filter = null; let filter = null;
if (this._clientOpts.lazyLoadMembers) { if (this._clientOpts.lazyLoadMembers) {
filter = LAZY_LOADING_MESSAGES_FILTER; // create a shallow copy of LAZY_LOADING_MESSAGES_FILTER,
// so the timelineFilter doesn't get written into it below
filter = Object.assign({}, LAZY_LOADING_MESSAGES_FILTER);
} }
if (timelineFilter) { if (timelineFilter) {
// XXX: it's horrific that /messages' filter parameter doesn't match // XXX: it's horrific that /messages' filter parameter doesn't match