lasers
/
FreeTube
mirror of https://github.com/FreeTubeApp/FreeTube
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add keyboard shortcuts to jump to the next and previous chapters (#2912) 

* Add keyboard shortcuts to jump to the next and previous chapters

* Change shortcut to Cmd for macOS
This commit is contained in:
absidue 2022-12-12 07:03:01 +01:00 committed by GitHub
parent 45953e3ba3
commit 10f9bf6d79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/renderer/components/ft-video-player/ft-video-player.js
View File

@ -1767,9 +1767,31 @@ export default Vue.extend({
return listContentHTML
},
/**
* determines whether the jump to the previous or next chapter
* with the the keyboard shortcuts, should be done
* first it checks whether there are any chapters (the array is also empty if chapters are hidden)
* it also checks that the approprate combination was used ALT/OPTION on macOS and CTRL everywhere else
* @param {KeyboardEvent} event the keyboard event
* @param {string} direction the direction of the jump either previous or next
* @returns {boolean}
*/
canChapterJump: function (event, direction) {
const currentChapter = this.$parent.videoCurrentChapterIndex
return this.chapters.length > 0 &&
(direction === 'previous' ? currentChapter > 0 : this.chapters.length - 1 !== currentChapter) &&
((process.platform !== 'darwin' && event.ctrlKey) ||
(process.platform === 'darwin' && event.metaKey))
},
// This function should always be at the bottom of this file
keyboardShortcutHandler: function (event) {
if (event.ctrlKey || document.activeElement.classList.contains('ft-input')) {
if (document.activeElement.classList.contains('ft-input')) {
return
}
// allow chapter jump keyboard shortcuts
if (event.ctrlKey && (process.platform === 'darwin' || (event.key !== 'ArrowLeft' && event.key !== 'ArrowRight'))) {
return
}
@ -1842,14 +1864,24 @@ export default Vue.extend({
this.changeVolume(-0.05)
break
case 'ArrowLeft':
// Rewind by the time-skip interval (in seconds)
event.preventDefault()
this.changeDurationBySeconds(-this.defaultSkipInterval * this.player.playbackRate())
if (this.canChapterJump(event, 'previous')) {
// Jump to the previous chapter
this.player.currentTime(this.chapters[this.$parent.videoCurrentChapterIndex - 1].startSeconds)
} else {
// Rewind by the time-skip interval (in seconds)
this.changeDurationBySeconds(-this.defaultSkipInterval * this.player.playbackRate())
}
break
case 'ArrowRight':
// Fast-Forward by the time-skip interval (in seconds)
event.preventDefault()
this.changeDurationBySeconds(this.defaultSkipInterval * this.player.playbackRate())
if (this.canChapterJump(event, 'next')) {
// Jump to the next chapter
this.player.currentTime(this.chapters[this.$parent.videoCurrentChapterIndex + 1].startSeconds)
} else {
// Fast-Forward by the time-skip interval (in seconds)
this.changeDurationBySeconds(this.defaultSkipInterval * this.player.playbackRate())
}
break
case 'I':
case 'i':