From 5aa7ed99146085132318b4cfedaa9eebb4f2abe8 Mon Sep 17 00:00:00 2001 From: Travis Arnold Date: Wed, 5 Aug 2015 09:37:41 -0700 Subject: [PATCH] fixed volume component --- README.md | 2 +- src/controls/Volume.jsx | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ddca9cc..67243ab 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ React media container component to help build video & audio players. ## TODOS - [x] Fix Progress component -- [] Fix Volume getting locked up when player is muted +- [x] Fix Volume getting locked up when player is muted - [] Playlist feature - [] Show time preview when hovering scrubber - [] Show thumbnail preview when hovering scrubber diff --git a/src/controls/Volume.jsx b/src/controls/Volume.jsx index e22fd56..124dece 100644 --- a/src/controls/Volume.jsx +++ b/src/controls/Volume.jsx @@ -5,8 +5,14 @@ class Volume { dragging = false _handleChange(e) { - const { player } = this.props; - player.volume = (+e.target.value).toFixed(4); + + let { muted, volume } = this.props.player; + + if(muted) { + muted = false; + } + + volume = (+e.target.value).toFixed(4); } _handleDragging() { @@ -15,11 +21,15 @@ class Volume { _handleDrag(e) { - const { player } = this.props; + let { muted, volume } = this.props.player; if(this.dragging) { - player.volume = (+e.target.value).toFixed(4); + if(muted) { + muted = false; + } + + volume = (+e.target.value).toFixed(4); if(e.type === 'mouseup') { this.dragging = false;