mirror of
https://github.com/turt2live/matrix-dimension.git
synced 2024-07-19 09:21:56 +00:00
Merge branch 'master' into travis/msc2140-tos
This commit is contained in:
commit
9cc1454527
|
@ -2,12 +2,12 @@
|
||||||
<my-spinner></my-spinner>
|
<my-spinner></my-spinner>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="!isLoading">
|
<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">
|
<div class="my-ibox-content">
|
||||||
<h5 style="text-align: center;">Sticker packs are not enabled on this Dimension instance.</h5>
|
<h5 style="text-align: center;">Sticker packs are not enabled on this Dimension instance.</h5>
|
||||||
</div>
|
</div>
|
||||||
</my-ibox>
|
</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">
|
<div class="my-ibox-content">
|
||||||
<form (submit)="importPack()" novalidate name="importForm">
|
<form (submit)="importPack()" novalidate name="importForm">
|
||||||
<label class="label-block">
|
<label class="label-block">
|
||||||
|
@ -43,4 +43,4 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</my-ibox>
|
</my-ibox>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -92,7 +92,7 @@ export class StickerpickerComponent implements OnInit {
|
||||||
|
|
||||||
const targetUrl = this.window.location.origin + "/widgets/stickerpicker";
|
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");
|
console.warn("Not replacing Dimension sticker picker");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -113,4 +113,4 @@ export class StickerpickerComponent implements OnInit {
|
||||||
console.error(e);
|
console.error(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user