Skip to content
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

Fix external player not opening on Subscriptions page #3172

Merged
merged 4 commits into from
Feb 9, 2023
Merged

Fix external player not opening on Subscriptions page #3172

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46f17c9
Changed undefined to null
ArturWagnerBusiness Feb 7, 2023
db8182e
Merge branch 'FreeTubeApp:development' into development
ArturWagnerBusiness Feb 8, 2023
7bb4834
revert last commit
ArturWagnerBusiness Feb 9, 2023
38f2883
Added tests for undefined in openInExternalPlayer()
ArturWagnerBusiness Feb 9, 2023
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
16 changes: 8 additions & 8 deletions src/renderer/store/modules/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ const actions = {
}
}

if (payload.playbackRate !== null) {
if (payload.playbackRate != null) {
if (typeof cmdArgs.playbackRate === 'string') {
args.push(`${cmdArgs.playbackRate}${payload.playbackRate}`)
} else if (!ignoreWarnings) {
Expand All @@ -516,8 +516,8 @@ const actions = {
}

// Check whether the video is in a playlist
if (typeof cmdArgs.playlistUrl === 'string' && payload.playlistId !== null && payload.playlistId !== '') {
if (payload.playlistIndex !== null) {
if (typeof cmdArgs.playlistUrl === 'string' && payload.playlistId != null && payload.playlistId !== '') {
if (payload.playlistIndex != null) {
if (typeof cmdArgs.playlistIndex === 'string') {
args.push(`${cmdArgs.playlistIndex}${payload.playlistIndex}`)
} else if (!ignoreWarnings) {
Expand Down Expand Up @@ -554,10 +554,10 @@ const actions = {
args.push(`${cmdArgs.playlistUrl}https://youtube.com/playlist?list=${payload.playlistId}`)
}
} else {
if (payload.playlistId !== null && payload.playlistId !== '' && !ignoreWarnings) {
if (payload.playlistId != null && payload.playlistId !== '' && !ignoreWarnings) {
showExternalPlayerUnsupportedActionToast(externalPlayer, 'opening playlists')
}
if (payload.videoId !== null) {
if (payload.videoId != null) {
if (cmdArgs.supportsYtdlProtocol) {
args.push(`${cmdArgs.videoUrl}ytdl://${payload.videoId}`)
} else {
Expand All @@ -566,9 +566,9 @@ const actions = {
}
}

const videoOrPlaylist = payload.playlistId === null || payload.playlistId === ''
? i18n.t('Video.External Player.video')
: i18n.t('Video.External Player.playlist')
const videoOrPlaylist = payload.playlistId != null && payload.playlistId !== ''
? i18n.t('Video.External Player.playlist')
: i18n.t('Video.External Player.video')

showToast(i18n.t('Video.External Player.OpeningTemplate', { videoOrPlaylist, externalPlayer }))

Expand Down