OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Correctly scroll to video comment

pull/1458/head
Chocobozzz 2019-01-08 15:16:54 +01:00 committed by Chocobozzz
parent 07a982363f
commit 43483d1296
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/app/videos/+video-watch/comment/video-comments.component.ts
View File

@ -83,11 +83,7 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
this.highlightedThread = new VideoComment(res.comment)
// Scroll to the highlighted thread
setTimeout(() => {
// -60 because of the fixed header
const scrollY = this.commentHighlightBlock.nativeElement.offsetTop - 60
window.scroll(0, scrollY)
}, 500)
setTimeout(() => this.commentHighlightBlock.nativeElement.scrollIntoView(), 0)
}
},

2
client/src/app/videos/+video-watch/video-watch.component.ts
View File

@ -375,7 +375,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
this.remoteServerDown = false
let startTime = urlOptions.startTime || (this.video.userHistory ? this.video.userHistory.currentTime : 0)
// Don't start the video if we are at the end
// If we are at the end of the video, reset the timer
if (this.video.duration - startTime <= 1) startTime = 0
if (this.video.isVideoNSFWForUser(this.user, this.serverService.getConfig())) {