ActivityPub-federated video streaming platform using P2P directly in your web browser
Fix settings menu arrow left/right navigation
Chocobozzz2011ea37e620
diff --git a/client/src/standalone/player/src/shared/peertube/peertube-plugin.ts b/client/src/standalone/player/src/shared/peertube/peertube-plugin.tsindex 897716930a..7d731ca7f1 100644--- a/client/src/standalone/player/src/shared/peertube/peertube-plugin.ts+++ b/client/src/standalone/player/src/shared/peertube/peertube-plugin.ts@@ -667,6 +667,20 @@ class PeerTubePlugin extends Plugin {return}+ if (event.key === 'ArrowRight') {+ event.preventDefault()+ event.stopPropagation()+ this.trigger('arrow-right', event.target)+ return+ }++ if (event.key === 'ArrowLeft') {+ event.preventDefault()+ event.stopPropagation()+ this.trigger('arrow-left')+ return+ }+fn.call(this, event)}}diff --git a/client/src/standalone/player/src/shared/settings/settings-menu-button.ts b/client/src/standalone/player/src/shared/settings/settings-menu-button.tsindex 38969a2500..715a0e2d39 100644--- a/client/src/standalone/player/src/shared/settings/settings-menu-button.ts+++ b/client/src/standalone/player/src/shared/settings/settings-menu-button.ts@@ -1,10 +1,13 @@+import debug from 'debug'import videojs from 'video.js'import { toTitleCase } from '../common'+import { MenuFocusFixed } from './menu-focus-fixed'import { SettingsDialog } from './settings-dialog'import { SettingsMenuItem } from './settings-menu-item'import { SettingsPanel } from './settings-panel'import { SettingsPanelChild } from './settings-panel-child'-import { MenuFocusFixed } from './menu-focus-fixed'++const debugLogger = debug('peertube:player:settings')const Button = videojs.getComponent('Button')const Component = videojs.getComponent('Component')@@ -213,6 +216,12 @@ class SettingsButton extends Button {this.focus()})+ this.menu.on('arrow-right', (_, el) => {+ debugLogger('Detected arrow right on menu item', el)++ el.click()+ })+this.menu.addClass('vjs-main-menu')const entries = this.settingsButtonOptions.entriesdiff --git a/client/src/standalone/player/src/shared/settings/settings-menu-item.ts b/client/src/standalone/player/src/shared/settings/settings-menu-item.tsindex 4176127027..91ab0c794e 100644--- a/client/src/standalone/player/src/shared/settings/settings-menu-item.ts+++ b/client/src/standalone/player/src/shared/settings/settings-menu-item.ts@@ -81,6 +81,10 @@ class SettingsMenuItem extends MenuItem {// Update on rate changeif (subMenuName === 'PlaybackRateMenuButton') {player.on('ratechange', this.submenuClickHandler)++ player.on('playbackrateschange', () => {+ setTimeout(() => this.rebuildAfterMenuChange())+ })}if (subMenuName === 'CaptionsButton') {@@ -262,6 +266,7 @@ class SettingsMenuItem extends MenuItem {this.createBackButton()this.setSize()this.bindClickEvents()+ this.bindKeyEvents()this.settingsSubMenuEl_.addEventListener('transitionend', this.transitionEndHandler, false)}@@ -306,13 +311,24 @@ class SettingsMenuItem extends MenuItem {bindClickEvents () {for (const item of this.subMenu.menu.children()) {- if (!(item instanceof Component)) {- continue- }+ if (!(item instanceof Component)) continue+item.on([ 'tap', 'click' ], this.submenuClickHandler)}}+ bindKeyEvents () {+ this.subMenu.menu.on('escaped-key', () => {+ this.trigger('escaped-key')+ })++ this.subMenu.menu.on('arrow-left', () => {+ debugLogger('Detected arrow left on sub menu ' + this.subMenu.name())++ this.loadMainMenu()+ })+ }+// save size of submenus on first init// if number of submenu items change dynamically more logic will be neededsetSize () {@@ -350,16 +366,13 @@ class SettingsMenuItem extends MenuItem {private rebuildAfterMenuChange () {debugLogger('Rebuilding menu ' + this.subMenu.name() + ' after change')- this.subMenu.menu.on('escaped-key', () => {- this.trigger('escaped-key')- })-this.settingsSubMenuEl_.innerHTML = ''this.settingsSubMenuEl_.appendChild(this.subMenu.menu.el())this.update()this.createBackButton()this.setSize()this.bindClickEvents()+ this.bindKeyEvents()}}