Pause the video when a modal is opened

pull/2302/head
Chocobozzz 2019-12-05 09:21:09 +01:00
parent 2526690866
commit 689a4f6946
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 25 additions and 1 deletions

View File

@ -57,6 +57,7 @@ export class VideoActionsDropdownComponent implements OnChanges {
@Output() videoRemoved = new EventEmitter()
@Output() videoUnblacklisted = new EventEmitter()
@Output() videoBlacklisted = new EventEmitter()
@Output() modalOpened = new EventEmitter()
videoActions: DropdownAction<{ video: Video }>[][] = []
@ -102,14 +103,20 @@ export class VideoActionsDropdownComponent implements OnChanges {
/* Show modals */
showDownloadModal () {
this.modalOpened.emit()
this.videoDownloadModal.show(this.video as VideoDetails)
}
showReportModal () {
this.modalOpened.emit()
this.videoReportModal.show()
}
showBlacklistModal () {
this.modalOpened.emit()
this.videoBlacklistModal.show()
}
@ -160,6 +167,8 @@ export class VideoActionsDropdownComponent implements OnChanges {
}
async removeVideo () {
this.modalOpened.emit()
const res = await this.confirmService.confirm(this.i18n('Do you really want to delete this video?'), this.i18n('Delete'))
if (res === false) return

View File

@ -98,7 +98,8 @@
</div>
<my-video-actions-dropdown
placement="top" buttonDirection="horizontal" [buttonStyled]="true" [video]="video" (videoRemoved)="onVideoRemoved()"
placement="top" buttonDirection="horizontal" [buttonStyled]="true" [video]="video"
(videoRemoved)="onVideoRemoved()" (modalOpened)="onModalOpened()"
></my-video-actions-dropdown>
</div>

View File

@ -203,10 +203,14 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
}
showSupportModal () {
this.pausePlayer()
this.videoSupportModal.show()
}
showShareModal () {
this.pausePlayer()
this.videoShareModal.show(this.currentTime)
}
@ -227,6 +231,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
}
}
onModalOpened () {
this.pausePlayer()
}
onVideoRemoved () {
this.redirectService.redirectToHomepage()
}
@ -622,4 +630,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
]
if (this.isUserLoggedIn()) this.hotkeysService.add(this.hotkeys)
}
private pausePlayer () {
if (!this.player) return
this.player.pause()
}
}