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

Tighten hotkeys definitions #3702

Merged
merged 2 commits into from
Feb 16, 2021
Merged

Tighten hotkeys definitions #3702

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
063adb1
client(hotkeys): tighten hotkey definitions
kontrollanten Feb 5, 2021
f964a85
client(hotkeys): remove seekstep VLC behavior
kontrollanten Feb 5, 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
32 changes: 15 additions & 17 deletions client/src/assets/player/peertube-player-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,9 @@ export class PeertubePlayerManager {
}

private static addHotkeysOptions (plugins: VideoJSPluginOptions) {
const isNaked = (event: KeyboardEvent, key: string) =>
(!event.ctrlKey && !event.altKey && !event.metaKey && !event.shiftKey && event.key === key)

Object.assign(plugins, {
hotkeys: {
skipInitialFocus: true,
Expand All @@ -540,28 +543,23 @@ export class PeertubePlayerManager {
enableVolumeScroll: false,
enableModifiersForNumbers: false,

fullscreenKey: function (event: KeyboardEvent) {
// fullscreen with the f key or Ctrl+Enter
return event.key === 'f' || (event.ctrlKey && event.key === 'Enter')
rewindKey: function (event: KeyboardEvent) {
return isNaked(event, 'ArrowLeft')
},

seekStep: function (event: KeyboardEvent) {
// mimic VLC seek behavior, and default to 5 (original value is 5).
if (event.ctrlKey && event.altKey) {
return 5 * 60
} else if (event.ctrlKey) {
return 60
} else if (event.altKey) {
return 10
} else {
return 5
}
forwardKey: function (event: KeyboardEvent) {
return isNaked(event, 'ArrowRight')
},

fullscreenKey: function (event: KeyboardEvent) {
// fullscreen with the f key or Ctrl+Enter
return isNaked(event, 'f') || (!event.altKey && event.ctrlKey && event.key === 'Enter')
},

customKeys: {
increasePlaybackRateKey: {
key: function (event: KeyboardEvent) {
return event.key === '>'
return isNaked(event, '>')
},
handler: function (player: videojs.Player) {
const newValue = Math.min(player.playbackRate() + 0.1, 5)
Expand All @@ -570,7 +568,7 @@ export class PeertubePlayerManager {
},
decreasePlaybackRateKey: {
key: function (event: KeyboardEvent) {
return event.key === '<'
return isNaked(event, '<')
},
handler: function (player: videojs.Player) {
const newValue = Math.max(player.playbackRate() - 0.1, 0.10)
Expand All @@ -579,7 +577,7 @@ export class PeertubePlayerManager {
},
frameByFrame: {
key: function (event: KeyboardEvent) {
return event.key === '.'
return isNaked(event, '.')
},
handler: function (player: videojs.Player) {
player.pause()
Expand Down