Skip to content

Added "last" and a reversed ?playlistPosition in playlist URL #3974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chocobozzz merged 6 commits into from
Apr 26, 2021
Merged

Added "last" and a reversed ?playlistPosition in playlist URL #3974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
177b7e9
Added "last" and a reversed playlistPosition
Poslovitch Apr 17, 2021
f1ea475
Fixed lint errors in video-watch component
Poslovitch Apr 17, 2021
b15d7d0
Applied requested changes
Poslovitch Apr 24, 2021
b3d9571
Removed debug logs
Poslovitch Apr 24, 2021
db3623a
Fixed lint
Poslovitch Apr 24, 2021
c257486
Playlist position styling
Chocobozzz Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions client/src/app/+videos/+video-watch/video-watch-playlist.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ export class VideoWatchPlaylistComponent {
updatePlaylistIndex (position: number) {
if (this.playlistElements.length === 0 || !position) return

// Handle the reverse index
if (position < 0) position = this.playlist.videosLength + position + 1

for (const playlistElement of this.playlistElements) {
// >= if the previous videos were not valid
if (playlistElement.video && playlistElement.position >= position) {
Expand Down
13 changes: 12 additions & 1 deletion client/src/app/+videos/+video-watch/video-watch.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,18 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
})

this.queryParamsSub = this.route.queryParams.subscribe(queryParams => {
this.playlistPosition = queryParams[ 'playlistPosition' ]
// Handle the ?playlistPosition
const positionParam = queryParams[ 'playlistPosition' ]

this.playlistPosition = positionParam === 'last'
? -1 // Handle the "last" index
: parseInt(positionParam, 10)

if (isNaN(this.playlistPosition)) {
console.error(`playlistPosition query param '${positionParam}' was parsed as NaN, defaulting to 1.`)
this.playlistPosition = 1
}

this.videoWatchPlaylist.updatePlaylistIndex(this.playlistPosition)

const start = queryParams[ 'start' ]
Expand Down