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

#885 remove auto play and filter unsupported media types

Browse Source
This commit is contained in:
Dániel Péter Sipos
2020-11-06 13:40:28 +01:00
parent 3802436531
commit d17b874156
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,15 +73,17 @@ export class MediaViewerImageComponent implements OnInit {
convertToGalleryImage(medias: MediaViewerItem[]): NgxGalleryImage[] { convertToGalleryImage(medias: MediaViewerItem[]): NgxGalleryImage[] {
const mappadImages = []; const mappadImages = [];
for (const image of medias) { for (const image of medias) {
mappadImages.push({ if (image.format === 'image') {
small: image.thumbnail mappadImages.push({
? image.thumbnail small: image.thumbnail
: './assets/images/replacement_image.svg', ? image.thumbnail
medium: image.thumbnail : './assets/images/replacement_image.svg',
? image.thumbnail medium: image.thumbnail
: './assets/images/replacement_image.svg', ? image.thumbnail
big: image.bitstream._links.content.href, : './assets/images/replacement_image.svg',
}); big: image.bitstream._links.content.href,
});
}
} }
return mappadImages; return mappadImages;
} }

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

@@ -1,15 +1,15 @@
<video <video
#media #media
[src]="medias[currentIndex].bitstream._links.content.href" [src]="filteredMedias[currentIndex].bitstream._links.content.href"
id="singleVideo" id="singleVideo"
[poster]=" [poster]="
medias[currentIndex].thumbnail || filteredMedias[currentIndex].thumbnail ||
this.replacements[this.medias[this.currentIndex].format] replacements[filteredMedias[currentIndex].format]
" "
preload="auto" preload="none"
controls controls
></video> ></video>
<div class="buttons" *ngIf="medias?.length > 1"> <div class="buttons" *ngIf="filteredMedias?.length > 1">
<button <button
class="btn btn-primary previous" class="btn btn-primary previous"
[disabled]="currentIndex === 0" [disabled]="currentIndex === 0"
@@ -20,7 +20,7 @@
<button <button
class="btn btn-primary next" class="btn btn-primary next"
[disabled]="currentIndex === medias.length - 1" [disabled]="currentIndex === filteredMedias.length - 1"
(click)="nextMedia()" (click)="nextMedia()"
> >
{{ "media-viewer.next" | translate }} {{ "media-viewer.next" | translate }}
@@ -36,7 +36,7 @@
<div ngbDropdownMenu aria-labelledby="dropdownBasic1"> <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
<button <button
ngbDropdownItem ngbDropdownItem
*ngFor="let item of medias; let i = index" *ngFor="let item of filteredMedias; let i = index"
class="list-element" class="list-element"
(click)="selectedMedia(i)" (click)="selectedMedia(i)"
> >

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

@@ -12,6 +12,8 @@ import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
export class MediaViewerVideoComponent implements OnInit { export class MediaViewerVideoComponent implements OnInit {
@Input() medias: MediaViewerItem[]; @Input() medias: MediaViewerItem[];
filteredMedias: MediaViewerItem[];
isCollapsed: boolean; isCollapsed: boolean;
currentIndex = 0; currentIndex = 0;
@@ -24,6 +26,9 @@ export class MediaViewerVideoComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.isCollapsed = false; this.isCollapsed = false;
this.filteredMedias = this.medias.filter(
(media) => media.format === 'audio' || media.format === 'video'
);
} }
/** /**