From: Chocobozzz Date: Mon, 24 Sep 2018 15:44:50 +0000 (+0200) Subject: Fix playback rate hotkey X-Git-Tag: v1.0.0-beta.14~7 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=5363a766d95ed8654ad3e1b94538f085c2a3a101;hp=47d0b3ee611d1ae85c92149521619ebdf5f5cc25;p=github%2FChocobozzz%2FPeerTube.git Fix playback rate hotkey --- diff --git a/client/src/assets/player/peertube-player.ts b/client/src/assets/player/peertube-player.ts index 5cea69eb8..2c16c87ec 100644 --- a/client/src/assets/player/peertube-player.ts +++ b/client/src/assets/player/peertube-player.ts @@ -73,20 +73,18 @@ function getVideojsOptions (options: { customKeys: { increasePlaybackRateKey: { key: function (event) { - // use '>' - return event.which === 51 + return event.key === '>' }, - handler: function (player, options, event) { - player.playbackRate(player.playbackRate() + 0.1) + handler: function (player) { + player.playbackRate((player.playbackRate() + 0.1).toFixed(2)) } }, decreasePlaybackRateKey: { key: function (event) { - // use '<' - return event.which === 50 + return event.key === '<' }, - handler: function (player, options, event) { - player.playbackRate(player.playbackRate() - 0.1) + handler: function (player) { + player.playbackRate((player.playbackRate() - 0.1).toFixed(2)) } } } diff --git a/client/src/assets/player/settings-menu-item.ts b/client/src/assets/player/settings-menu-item.ts index f6cf6d0f3..665ce6fc2 100644 --- a/client/src/assets/player/settings-menu-item.ts +++ b/client/src/assets/player/settings-menu-item.ts @@ -41,6 +41,10 @@ class SettingsMenuItem extends MenuItem { // Voodoo magic for IOS setTimeout(() => { this.build() + + // Update on rate change + player.on('ratechange', this.submenuClickHandler) + this.reset() }, 0) }) @@ -60,7 +64,7 @@ class SettingsMenuItem extends MenuItem { target = event.currentTarget } - if (target.classList.contains('vjs-back-button')) { + if (target && target.classList.contains('vjs-back-button')) { this.loadMainMenu() return }