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

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

Browse Source
This commit is contained in:
Weblate 2018-05-14 16:40:18 +00:00
commit deec515e97
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/utils/widgets.js
View File

@ -58,8 +58,7 @@ function getUserWidgetsArray() {
*/ */
function getStickerpickerWidgets() { function getStickerpickerWidgets() {
const widgets = getUserWidgetsArray(); const widgets = getUserWidgetsArray();
const stickerpickerWidgets = widgets.filter((widget) => widget.type='m.stickerpicker'); return widgets.filter((widget) => widget.content && widget.content.type === "m.stickerpicker");
return stickerpickerWidgets;
} }
/** /**
@ -73,7 +72,7 @@ function removeStickerpickerWidgets() {
} }
const userWidgets = client.getAccountData('m.widgets').getContent() || {}; const userWidgets = client.getAccountData('m.widgets').getContent() || {};
Object.entries(userWidgets).forEach(([key, widget]) => { Object.entries(userWidgets).forEach(([key, widget]) => {
if (widget.type === 'm.stickerpicker') { if (widget.content && widget.content.type === 'm.stickerpicker') {
delete userWidgets[key]; delete userWidgets[key];
} }
}); });