Don't pause video upon modal open (#3909)

* client: dont pause video upon modal open

closes #3816

* client(video/watch): remove obsolete code

* gitignore: add vscode and vim swp files
pull/3747/head
kontrollanten 2021-04-08 13:37:57 +02:00 committed by GitHub
parent 97c116edf9
commit ca87329289
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 37 deletions

2
.gitignore vendored
View File

@ -30,9 +30,11 @@ yarn-error.log
# IDE # IDE
/*.sublime-project /*.sublime-project
/*.sublime-workspace /*.sublime-workspace
/*.vscode
/**/.idea /**/.idea
/dist /dist
/PeerTube.iml /PeerTube.iml
*.swp
# Zanata # Zanata
/.zanata-cache /.zanata-cache

View File

@ -142,7 +142,7 @@
<ng-container *ngIf="isUserLoggedIn()"> <ng-container *ngIf="isUserLoggedIn()">
<my-video-actions-dropdown <my-video-actions-dropdown
placement="bottom auto" buttonDirection="horizontal" [buttonStyled]="true" [video]="video" [videoCaptions]="videoCaptions" placement="bottom auto" buttonDirection="horizontal" [buttonStyled]="true" [video]="video" [videoCaptions]="videoCaptions"
[displayOptions]="videoActionsOptions" (videoRemoved)="onVideoRemoved()" (modalOpened)="onModalOpened()" [displayOptions]="videoActionsOptions" (videoRemoved)="onVideoRemoved()"
></my-video-actions-dropdown> ></my-video-actions-dropdown>
</ng-container> </ng-container>
</div> </div>

View File

@ -284,23 +284,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
} }
showSupportModal () { showSupportModal () {
// Check video was playing before opening support modal this.supportModal.show()
const isVideoPlaying = this.isPlaying()
this.pausePlayer()
const modalRef = this.supportModal.show()
modalRef.result.then(() => {
if (isVideoPlaying) {
this.resumePlayer()
}
})
} }
showShareModal () { showShareModal () {
this.pausePlayer()
this.videoShareModal.show(this.currentTime, this.videoWatchPlaylist.currentPlaylistPosition) this.videoShareModal.show(this.currentTime, this.videoWatchPlaylist.currentPlaylistPosition)
} }
@ -323,10 +310,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
} }
} }
onModalOpened () {
this.pausePlayer()
}
onVideoRemoved () { onVideoRemoved () {
this.redirectService.redirectToHomepage() this.redirectService.redirectToHomepage()
} }
@ -884,24 +867,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
return { playerMode: mode, playerOptions: options } return { playerMode: mode, playerOptions: options }
} }
private pausePlayer () {
if (!this.player) return
this.player.pause()
}
private resumePlayer () {
if (!this.player) return
this.player.play()
}
private isPlaying () {
if (!this.player) return
return !this.player.paused()
}
private async subscribeToLiveEventsIfNeeded (oldVideo: VideoDetails, newVideo: VideoDetails) { private async subscribeToLiveEventsIfNeeded (oldVideo: VideoDetails, newVideo: VideoDetails) {
if (!this.liveVideosSub) { if (!this.liveVideosSub) {
this.liveVideosSub = this.buildLiveEventsSubscription() this.liveVideosSub = this.buildLiveEventsSubscription()