Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Oops, actually get account data event.

Browse Source 
Also ignore any account data events that aren;t widgets.
This commit is contained in:
David Baker 2018-05-15 14:13:56 +01:00
parent f4d69e26e9
commit d0ec467c34
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ScalarMessaging.js
View File

@ -293,13 +293,20 @@ function inviteUser(event, roomId, userId) {
*/ */
function waitForUserWidget(widgetId) { function waitForUserWidget(widgetId) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (ev.getContent() && ev.getContent()[widgetId] !== undefined) { const currentAccountDataEvent = MatrixClientPeg.get().getAccountData('m.widgets');
if (
currentAccountDataEvent &&
currentAccountDataEvent.getContent() &&
currentAccountDataEvent.getContent()[widgetId] !== undefined
) {
resolve(); resolve();
return; return;
} }
let timerId; let timerId;
function onAccountData(ev) { function onAccountData(ev) {
if (ev.getType() != 'm.widgets') return;
if (ev.getContent() && ev.getContent()[widgetId] !== undefined) { if (ev.getContent() && ev.getContent()[widgetId] !== undefined) {
MatrixClientPeg.get().removeListener('accountData', onAccountData); MatrixClientPeg.get().removeListener('accountData', onAccountData);
clearTimeout(timerId); clearTimeout(timerId);