hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-embargoed-thumbnails_contribute-8.1' into fix-embargoed-thumbnails_contribute-9.0

Browse Source
This commit is contained in:
Art Lowel
2025-05-06 14:57:23 +02:00
parent 80dd89da56 a7bcddf597
commit a84365996b
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/app/thumbnail/thumbnail.component.ts
View File

@@ -95,13 +95,6 @@ export class ThumbnailComponent implements OnChanges {
*/
ngOnChanges(changes: SimpleChanges): void {
if (isPlatformBrowser(this.platformID)) {
// every time the inputs change we need to start the loading animation again, as it's possible
// that thumbnail is first set to null when the parent component initializes and then set to
// the actual value
if (!this.isLoading()) {
this.isLoading.set(true);
}
if (hasNoValue(this.thumbnail)) {
this.setSrc(this.defaultImage);
return;
@@ -194,9 +187,22 @@ export class ThumbnailComponent implements OnChanges {
* @param src
*/
setSrc(src: string): void {
this.src.set(src);
if (src === null) {
this.isLoading.set(false);
// only update the src if it has changed (the parent component may fire the same one multiple times
if (this.src() !== src) {
// every time the src changes we need to start the loading animation again, as it's possible
// that it is first set to null when the parent component initializes and then set to
// the actual value
//
// isLoading$ will be set to false by the error or success handler afterwards, except in the
// case where src is null, then we have to set it manually here (because those handlers won't
// trigger)
if (this.isLoading() === false) {
this.isLoading.set(true);
}
this.src.set(src);
if (src === null) {
this.isLoading.set(false);
}
}
}