imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5202 from matrix-org/t3chguy/fix/15140

Browse source 
Don't count widgets which no longer exist towards pinned count
This commit is contained in:
Michael Telatynski 2020-09-14 15:38:10 +01:00 • committed by GitHub
commit e261a18183
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/stores/WidgetStore.ts
View file

@ -167,7 +167,9 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
// the only case it will go to three is if you have two and then a Jitsi gets added // the only case it will go to three is if you have two and then a Jitsi gets added
const roomId = this.getRoomId(widgetId); const roomId = this.getRoomId(widgetId);
const roomInfo = this.getRoom(roomId); const roomInfo = this.getRoom(roomId);
return roomInfo && Object.keys(roomInfo.pinned).length < 2; return roomInfo && Object.keys(roomInfo.pinned).filter(k => {
return roomInfo.widgets.some(app => app.id === k);
}).length < 2;
} }
public pinWidget(widgetId: string) { public pinWidget(widgetId: string) {