Mastodon/Sengi-Windows-MacOS-Linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Nicolas Constant 2019-02-27 23:16:29 -05:00
parent 580c886b57
commit 97d223feae
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/components/media-viewer/media-viewer.component.html
View File

@ -2,13 +2,11 @@
<button class="media-viewer-canvas__close" title="close"> <button class="media-viewer-canvas__close" title="close">
<fa-icon [icon]="faTimes"></fa-icon> <fa-icon [icon]="faTimes"></fa-icon>
</button> </button>
<img class="media-viewer-canvas__image" *ngIf="imageUrl" src="{{imageUrl}}" /> <img class="media-viewer-canvas__image" *ngIf="imageUrl" src="{{imageUrl}}" (click)="blockClick($event)"/>
<video class="media-viewer-canvas__image" *ngIf="gifvUrl" role="application" loop autoplay <video class="media-viewer-canvas__image" *ngIf="gifvUrl" role="application" loop autoplay (click)="blockClick($event)">
(click)="attachmentSelected(0)">
<source src="{{ gifvUrl }}" type="video/mp4"> <source src="{{ gifvUrl }}" type="video/mp4">
</video> </video>
<video class="media-viewer-canvas__image" *ngIf="videoUrl" role="application" loop controls="controls" <video class="media-viewer-canvas__image" *ngIf="videoUrl" role="application" loop controls="controls" (click)="blockClick($event)">
(click)="attachmentSelected(0)">
<source src="{{ videoUrl }}" type="video/mp4"> <source src="{{ videoUrl }}" type="video/mp4">
</video> </video>
</div> </div>

9
src/app/components/media-viewer/media-viewer.component.ts
View File

@ -40,9 +40,6 @@ export class MediaViewerComponent implements OnInit {
} }
private loadAttachment(attachment: Attachment) { private loadAttachment(attachment: Attachment) {
console.warn('attachment');
console.warn(attachment);
if (attachment.type === 'image') { if (attachment.type === 'image') {
this.imageUrl = attachment.url; this.imageUrl = attachment.url;
} else if (attachment.type === 'gifv'){ } else if (attachment.type === 'gifv'){
@ -52,9 +49,13 @@ export class MediaViewerComponent implements OnInit {
} }
} }
close(): boolean { close(): boolean {
this.closeSubject.next(true); this.closeSubject.next(true);
return false; return false;
} }
blockClick(event: any): boolean{
event.stopPropagation();
return false;
}
} }