logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 7a0a13ab53eda1c7ccdfb5176fecd61dcf1ad93f
parent: cec7e698275f7f3a8d88ddf205a0c04d6adb13cd
Author: Eugen <eugen@zeonfederated.com>
Date:   Sun,  8 Jan 2017 02:36:12 +0100

Merge pull request #432 from blackle/volume-icon

Show correct volume icons on video player

Diffstat:

Mapp/assets/javascripts/components/components/video_player.jsx2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/components/components/video_player.jsx b/app/assets/javascripts/components/components/video_player.jsx @@ -113,7 +113,7 @@ const VideoPlayer = React.createClass({ return ( <div style={{ cursor: 'default', marginTop: '8px', overflow: 'hidden', width: `${width}px`, height: `${height}px`, boxSizing: 'border-box', background: '#000', position: 'relative' }}> - <div style={muteStyle}><IconButton title={intl.formatMessage(messages.toggle_sound)} icon={this.state.muted ? 'volume-up' : 'volume-off'} onClick={this.handleClick} /></div> + <div style={muteStyle}><IconButton title={intl.formatMessage(messages.toggle_sound)} icon={this.state.muted ? 'volume-off' : 'volume-up'} onClick={this.handleClick} /></div> <video src={media.get('url')} autoPlay='true' loop={true} muted={this.state.muted} style={videoStyle} onClick={this.handleVideoClick} /> </div> );