Matrix-Mirrors/matrix-dimension
1
0
Fork 0
mirror of https://github.com/turt2live/matrix-dimension.git synced 2024-07-08 12:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into travis/msc2140-tos

Browse Source
This commit is contained in:
Travis Ralston 2019-07-10 22:22:50 -06:00
commit 9cc1454527
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/app/configs/stickerpicker/stickerpicker.component.html
View File

@ -2,12 +2,12 @@
<my-spinner></my-spinner>
</div>
<div *ngIf="!isLoading">
<my-ibox boxTitle="Sticker Packs" *ngIf="packs.length <= 0">
<my-ibox boxTitle="Sticker Packs" *ngIf="packs.length <= 0 && !customEnabled">
<div class="my-ibox-content">
<h5 style="text-align: center;">Sticker packs are not enabled on this Dimension instance.</h5>
</div>
</my-ibox>
<my-ibox boxTitle="Add Sticker Packs" *ngIf="packs.length > 0 && customEnabled">
<my-ibox boxTitle="Add Sticker Packs" *ngIf="customEnabled">
<div class="my-ibox-content">
<form (submit)="importPack()" novalidate name="importForm">
<label class="label-block">
@ -43,4 +43,4 @@
</div>
</div>
</my-ibox>
</div>
</div>

4
web/app/configs/stickerpicker/stickerpicker.component.ts
View File

@ -92,7 +92,7 @@ export class StickerpickerComponent implements OnInit {
const targetUrl = this.window.location.origin + "/widgets/stickerpicker";
if (widgets.response[0].content.url === targetUrl) {
if (Array.isArray(widgets.response) && widgets.response.length && widgets.response[0].content.url === targetUrl) {
console.warn("Not replacing Dimension sticker picker");
return;
}
@ -113,4 +113,4 @@ export class StickerpickerComponent implements OnInit {
console.error(e);
}
}
}
}