Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions src/renderer/components/ParentalControlSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
:default-value="showFamilyFriendlyOnly"
@change="updateShowFamilyFriendlyOnly"
/>
<FtToggleSwitch
:label="$t('Settings.Parental Control Settings.Disable Channel Link on Videos')"
compact
:default-value="disableChannelLink"
@change="updateDisableChannelLink"
/>
</div>
<div class="switchColumn">
<FtToggleSwitch
Expand Down Expand Up @@ -59,6 +65,10 @@ const showFamilyFriendlyOnly = computed(() => {
return store.getters.getShowFamilyFriendlyOnly
})

const disableChannelLink = computed(() => {
return store.getters.getDisableChannelLink
})

/**
* @param {boolean} value
*/
Expand Down Expand Up @@ -86,4 +96,11 @@ function updateHideUploader(value) {
function updateShowFamilyFriendlyOnly(value) {
store.dispatch('updateShowFamilyFriendlyOnly', value)
}

/**
* @param {boolean} value
*/
function updateDisableChannelLink(value) {
store.dispatch('updateDisableChannelLink', value)
}
</script>
4 changes: 4 additions & 0 deletions src/renderer/components/ft-list-video/ft-list-video.js
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,10 @@ export default defineComponent({
deArrowCache: function () {
return this.$store.getters.getDeArrowCache[this.id]
},

disableChannelLink: function () {
return this.$store.getters.getDisableChannelLink
},
},
watch: {
showAddToPlaylistPrompt(value) {
Expand Down
5 changes: 5 additions & 0 deletions src/renderer/components/ft-list-video/ft-list-video.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,8 @@
.deArrowToggleIcon {
inline-size: 1em;
}

.linkDisabled {
text-decoration: none;
cursor: initial;
}
3 changes: 2 additions & 1 deletion src/renderer/components/ft-list-video/ft-list-video.vue
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,9 @@
<router-link
v-if="channelId !== null"
class="channelName"
:class="{ 'linkDisabled': disableChannelLink }"
dir="auto"
:to="`/channel/${channelId}`"
:to="!disableChannelLink ? `/channel/${channelId}`: ``"
>
{{ channelName }}
</router-link>
Expand Down
1 change: 1 addition & 0 deletions src/renderer/store/modules/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ const state = {
defaultViewingMode: 'default',
defaultVideoFormat: 'dash',
disableSmoothScrolling: false,
disableChannelLink: false,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this name is quite ambiguous coz I can clearly see channel links in watch page...
Need something more specific

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about something like disableChannelLinkOnVideoThumbnail?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would be a good name if we really use it to disable all channel links not just on video thumbnails :)

Suggested change
disableChannelLink: false,
disableChannelLinks: false,

displayVideoPlayButton: false,
enableSearchSuggestions: true,
enableSubtitlesByDefault: false,
Expand Down
8 changes: 8 additions & 0 deletions static/locales/en-US.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,14 @@ Settings:
Hide Uploader on Watch page: Hide Uploader on Watch page
Show Family Friendly Only: Show Family Friendly Only
Hide Search Bar: Hide Search Bar
Disable Channel Link on Videos : Disable Channel Link on Vidoes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not copy and paste!? (key > value)
Also got the same issue on where does this apply (basically the same as above)

Suggested change
Disable Channel Link on Videos : Disable Channel Link on Vidoes
Disable Channel Link on Videos : Disable Channel Link on Videos

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, my bad! Same as above too, Disable Channel Link on Video Thumbnails?

Download Settings:
Download Settings: Download
Ask Download Path: Ask for download path
Choose Path: Choose Path
Download Behavior: Download Behavior
Download in app: Download in app
Open in web browser: Open in web browser
Experimental Settings:
Experimental Settings: Experimental
Warning: These settings are experimental, they may cause crashes while enabled. Making backups is highly recommended. Use at your own risk!
Expand Down