hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-12 20:43:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

#885 fix build

Browse Source
This commit is contained in:
Dániel Péter Sipos
2020-11-23 09:47:56 +01:00
parent b5ffe718d2
commit b14ae840b0
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/+item-page/media-viewer/media-viewer.component.html
View File

@@ -15,15 +15,13 @@
<ds-media-viewer-video [medias]="mediaList"></ds-media-viewer-video> <ds-media-viewer-video [medias]="mediaList"></ds-media-viewer-video>
</ng-container> </ng-container>
</ng-container> </ng-container>
<ng-container *ngIf="imageOptions">
<ng-container *ngIf="mediaList[0]?.format === 'image'"> <ng-container *ngIf="mediaList[0]?.format === 'image'">
<ds-media-viewer-image [images]="mediaList"></ds-media-viewer-image> <ds-media-viewer-image [images]="mediaList"></ds-media-viewer-image>
</ng-container> </ng-container>
</ng-container> </ng-container>
</ng-container>
<ng-container <ng-container
*ngIf=" *ngIf="
((!imageOptions || mediaList[0]?.format !== 'image') && ((mediaList[0]?.format !== 'image') &&
(!videoOptions || mediaList[0]?.format !== 'video') && (!videoOptions || mediaList[0]?.format !== 'video') &&
(!videoOptions || mediaList[0]?.format !== 'audio')) || (!videoOptions || mediaList[0]?.format !== 'audio')) ||
mediaList.length === 0 mediaList.length === 0

1
src/app/+item-page/media-viewer/media-viewer.component.ts
View File

@@ -23,7 +23,6 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
}) })
export class MediaViewerComponent implements OnInit { export class MediaViewerComponent implements OnInit {
@Input() item: Item; @Input() item: Item;
@Input() imageOptions: boolean;
@Input() videoOptions: boolean; @Input() videoOptions: boolean;
mediaList$: BehaviorSubject<MediaViewerItem[]>; mediaList$: BehaviorSubject<MediaViewerItem[]>;

2
src/app/+item-page/simple/item-types/publication/publication.component.html
View File

@@ -15,7 +15,7 @@
</ds-metadata-field-wrapper> </ds-metadata-field-wrapper>
</ng-container> </ng-container>
<ng-container *ngIf="mediaViewer.image"> <ng-container *ngIf="mediaViewer.image">
<ds-media-viewer [item]="object" [imageOptions]="mediaViewer.image" [videoOptions]="mediaViewer.video"></ds-media-viewer> <ds-media-viewer [item]="object" [videoOptions]="mediaViewer.video"></ds-media-viewer>
</ng-container> </ng-container>
<ds-item-page-file-section [item]="object"></ds-item-page-file-section> <ds-item-page-file-section [item]="object"></ds-item-page-file-section>
<ds-item-page-date-field [item]="object"></ds-item-page-date-field> <ds-item-page-date-field [item]="object"></ds-item-page-date-field>

1
src/environments/mock-environment.ts
View File

@@ -198,7 +198,6 @@ export const environment: Partial<GlobalConfig> = {
name: 'default', name: 'default',
}, },
mediaViewer: { mediaViewer: {
enable: true,
image: true, image: true,
video: true, video: true,
}, },