aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorChocobozzz <chocobozzz@framasoft.org>2018-07-09 15:04:50 +0200
committerChocobozzz <chocobozzz@framasoft.org>2018-07-09 15:04:50 +0200
commit5634dfc81161918c2da018989a518f1ef5fe2664 (patch)
tree586e03ca7bf6ad82b96948929738ed597639e573 /client
parenta55e5579bc19872219d836a4273305deeee3a2ca (diff)
parentc4ccb08ab00dc318d22f381bccd9b78853376bae (diff)
downloadPeerTube-5634dfc81161918c2da018989a518f1ef5fe2664.tar.gz
PeerTube-5634dfc81161918c2da018989a518f1ef5fe2664.tar.zst
PeerTube-5634dfc81161918c2da018989a518f1ef5fe2664.zip
Merge branch 'ctrl-number-hotkeys' into 'develop'
Disable hotkeys modifiers for numbers in the player See merge request chocobozzz/PeerTube!14
Diffstat (limited to 'client')
-rw-r--r--client/src/assets/player/peertube-player.ts3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/src/assets/player/peertube-player.ts b/client/src/assets/player/peertube-player.ts
index 7c9a43ed9..7e339990c 100644
--- a/client/src/assets/player/peertube-player.ts
+++ b/client/src/assets/player/peertube-player.ts
@@ -55,7 +55,8 @@ function getVideojsOptions (options: {
55 if (options.enableHotkeys === true) { 55 if (options.enableHotkeys === true) {
56 Object.assign(videojsOptions.plugins, { 56 Object.assign(videojsOptions.plugins, {
57 hotkeys: { 57 hotkeys: {
58 enableVolumeScroll: false 58 enableVolumeScroll: false,
59 enableModifiersForNumbers: false
59 } 60 }
60 }) 61 })
61 } 62 }