me
/
glitchier-soc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add overlay style to buttons, continue video after expanding it

Browse Source
th-downstream
Eugen Rochko 8 years ago
parent 0744eb8838
commit a148a3900e
8 changed files with 88 additions and 31 deletions
Show Stats Download Patch File Download Diff File

30
app/assets/javascripts/components/components/extended_video_player.jsx
Unescape View File

@ -4,16 +4,42 @@ const ExtendedVideoPlayer = React.createClass({
propTypes: { propTypes: {
src: React.PropTypes.string.isRequired, src: React.PropTypes.string.isRequired,
time: React.PropTypes.number,
controls: React.PropTypes.bool.isRequired, controls: React.PropTypes.bool.isRequired,
muted: React.PropTypes.bool.isRequired muted: React.PropTypes.bool.isRequired
}, },
mixins: [PureRenderMixin], mixins: [PureRenderMixin],
handleLoadedData () {
if (this.props.time) {
this.video.currentTime = this.props.time;
}
},
componentDidMount () {
this.video.addEventListener('loadeddata', this.handleLoadedData);
},
componentWillUnmount () {
this.video.removeEventListener('loadeddata', this.handleLoadedData);
},
setRef (c) {
this.video = c;
},
render () { render () {
return ( return (
<div> <div className='extended-video-player'>
<video src={this.props.src} autoPlay muted={this.props.muted} controls={this.props.controls} loop /> <video
ref={this.setRef}
src={this.props.src}
autoPlay
muted={this.props.muted}
controls={this.props.controls}
loop={!this.props.controls}
/>
</div> </div>
); );
}, },

28
app/assets/javascripts/components/components/icon_button.jsx
Unescape View File

@ -13,7 +13,8 @@ const IconButton = React.createClass({
activeStyle: React.PropTypes.object, activeStyle: React.PropTypes.object,
disabled: React.PropTypes.bool, disabled: React.PropTypes.bool,
inverted: React.PropTypes.bool, inverted: React.PropTypes.bool,
animate: React.PropTypes.bool animate: React.PropTypes.bool,
overlay: React.PropTypes.bool
}, },
getDefaultProps () { getDefaultProps () {
@ -21,7 +22,8 @@ const IconButton = React.createClass({
size: 18, size: 18,
active: false, active: false,
disabled: false, disabled: false,
animate: false animate: false,
overlay: false
}; };
}, },
@ -39,7 +41,7 @@ const IconButton = React.createClass({
let style = { let style = {
fontSize: `${this.props.size}px`, fontSize: `${this.props.size}px`,
width: `${this.props.size * 1.28571429}px`, width: `${this.props.size * 1.28571429}px`,
height: `${this.props.size}px`, height: `${this.props.size * 1.28571429}px`,
lineHeight: `${this.props.size}px`, lineHeight: `${this.props.size}px`,
...this.props.style ...this.props.style
}; };
@ -48,13 +50,31 @@ const IconButton = React.createClass({
style = { ...style, ...this.props.activeStyle }; style = { ...style, ...this.props.activeStyle };
} }
const classes = ['icon-button'];
if (this.props.active) {
classes.push('active');
}
if (this.props.disabled) {
classes.push('disabled');
}
if (this.props.inverted) {
classes.push('inverted');
}
if (this.props.overlay) {
classes.push('overlayed');
}
return ( return (
<Motion defaultStyle={{ rotate: this.props.active ? -360 : 0 }} style={{ rotate: this.props.animate ? spring(this.props.active ? -360 : 0, { stiffness: 120, damping: 7 }) : 0 }}> <Motion defaultStyle={{ rotate: this.props.active ? -360 : 0 }} style={{ rotate: this.props.animate ? spring(this.props.active ? -360 : 0, { stiffness: 120, damping: 7 }) : 0 }}>
{({ rotate }) => {({ rotate }) =>
<button <button
aria-label={this.props.title} aria-label={this.props.title}
title={this.props.title} title={this.props.title}
className={`icon-button ${this.props.active ? 'active' : ''} ${this.props.disabled ? 'disabled' : ''} ${this.props.inverted ? 'inverted' : ''}`} className={classes.join(' ')}
onClick={this.handleClick} onClick={this.handleClick}
style={style}> style={style}>
<i style={{ transform: `rotate(${rotate}deg)` }} className={`fa fa-fw fa-${this.props.icon}`} aria-hidden='true' /> <i style={{ transform: `rotate(${rotate}deg)` }} className={`fa fa-fw fa-${this.props.icon}`} aria-hidden='true' />

8
app/assets/javascripts/components/components/media_gallery.jsx
Unescape View File

@ -39,8 +39,8 @@ const spoilerSubSpanStyle = {
const spoilerButtonStyle = { const spoilerButtonStyle = {
position: 'absolute', position: 'absolute',
top: '6px', top: '4px',
left: '8px', left: '4px',
zIndex: '100' zIndex: '100'
}; };
@ -232,8 +232,8 @@ const MediaGallery = React.createClass({
return ( return (
<div style={{ ...outerStyle, height: `${this.props.height}px` }}> <div style={{ ...outerStyle, height: `${this.props.height}px` }}>
<div style={spoilerButtonStyle}> <div style={{ ...spoilerButtonStyle, display: !this.state.visible ? 'none' : 'block' }}>
<IconButton title={intl.formatMessage(messages.toggle_visible)} icon={this.state.visible ? 'eye' : 'eye-slash'} onClick={this.handleOpen} /> <IconButton title={intl.formatMessage(messages.toggle_visible)} icon={this.state.visible ? 'eye' : 'eye-slash'} overlay onClick={this.handleOpen} />
</div> </div>
{children} {children}

26
app/assets/javascripts/components/components/video_player.jsx
Unescape View File

@ -22,8 +22,8 @@ const videoStyle = {
const muteStyle = { const muteStyle = {
position: 'absolute', position: 'absolute',
top: '10px', top: '4px',
right: '10px', right: '4px',
color: 'white', color: 'white',
textShadow: "0px 1px 1px black, 1px 0px 1px black", textShadow: "0px 1px 1px black, 1px 0px 1px black",
opacity: '0.8', opacity: '0.8',
@ -55,8 +55,8 @@ const spoilerSubSpanStyle = {
const spoilerButtonStyle = { const spoilerButtonStyle = {
position: 'absolute', position: 'absolute',
top: '6px', top: '4px',
left: '8px', left: '4px',
color: 'white', color: 'white',
textShadow: "0px 1px 1px black, 1px 0px 1px black", textShadow: "0px 1px 1px black, 1px 0px 1px black",
zIndex: '100' zIndex: '100'
@ -64,8 +64,8 @@ const spoilerButtonStyle = {
const expandButtonStyle = { const expandButtonStyle = {
position: 'absolute', position: 'absolute',
bottom: '6px', bottom: '4px',
right: '8px', right: '4px',
color: 'white', color: 'white',
textShadow: "0px 1px 1px black, 1px 0px 1px black", textShadow: "0px 1px 1px black, 1px 0px 1px black",
zIndex: '100' zIndex: '100'
@ -128,10 +128,8 @@ const VideoPlayer = React.createClass({
}, },
handleExpand () { handleExpand () {
const node = ReactDOM.findDOMNode(this).querySelector('video'); this.video.pause();
node.pause(); this.props.onOpenVideo(this.props.media, this.video.currentTime);
this.props.onOpenVideo(this.props.media);
}, },
setRef (c) { setRef (c) {
@ -172,14 +170,14 @@ const VideoPlayer = React.createClass({
const { media, intl, width, height, sensitive, autoplay } = this.props; const { media, intl, width, height, sensitive, autoplay } = this.props;
let spoilerButton = ( let spoilerButton = (
<div style={spoilerButtonStyle} > <div style={{...spoilerButtonStyle, display: !this.state.visible ? 'none' : 'block'}} >
<IconButton title={intl.formatMessage(messages.toggle_visible)} icon={this.state.visible ? 'eye' : 'eye-slash'} onClick={this.handleVisibility} /> <IconButton overlay title={intl.formatMessage(messages.toggle_visible)} icon={this.state.visible ? 'eye' : 'eye-slash'} onClick={this.handleVisibility} />
</div> </div>
); );
let expandButton = ( let expandButton = (
<div style={expandButtonStyle} > <div style={expandButtonStyle} >
<IconButton title={intl.formatMessage(messages.expand_video)} icon='expand' onClick={this.handleExpand} /> <IconButton overlay title={intl.formatMessage(messages.expand_video)} icon='expand' onClick={this.handleExpand} />
</div> </div>
); );
@ -188,7 +186,7 @@ const VideoPlayer = React.createClass({
if (this.state.hasAudio) { if (this.state.hasAudio) {
muteButton = ( muteButton = (
<div style={muteStyle}> <div style={muteStyle}>
<IconButton title={intl.formatMessage(messages.toggle_sound)} icon={this.state.muted ? 'volume-off' : 'volume-up'} onClick={this.handleClick} /> <IconButton overlay title={intl.formatMessage(messages.toggle_sound)} icon={this.state.muted ? 'volume-off' : 'volume-up'} onClick={this.handleClick} />
</div> </div>
); );
} }

4
app/assets/javascripts/components/containers/status_container.jsx
Unescape View File

@ -75,8 +75,8 @@ const mapDispatchToProps = (dispatch) => ({
dispatch(openModal('MEDIA', { media, index })); dispatch(openModal('MEDIA', { media, index }));
}, },
onOpenVideo (media) { onOpenVideo (media, time) {
dispatch(openModal('VIDEO', { media })); dispatch(openModal('VIDEO', { media, time }));
}, },
onBlock (account) { onBlock (account) {

4
app/assets/javascripts/components/features/status/index.jsx
Unescape View File

@ -112,8 +112,8 @@ const Status = React.createClass({
this.props.dispatch(openModal('MEDIA', { media, index })); this.props.dispatch(openModal('MEDIA', { media, index }));
}, },
handleOpenVideo (media) { handleOpenVideo (media, time) {
this.props.dispatch(openModal('VIDEO', { media })); this.props.dispatch(openModal('VIDEO', { media, time }));
}, },
handleReport (status) { handleReport (status) {

7
app/assets/javascripts/components/features/ui/components/video_modal.jsx
Unescape View File

@ -20,6 +20,7 @@ const VideoModal = React.createClass({
propTypes: { propTypes: {
media: ImmutablePropTypes.map.isRequired, media: ImmutablePropTypes.map.isRequired,
time: React.PropTypes.number,
onClose: React.PropTypes.func.isRequired, onClose: React.PropTypes.func.isRequired,
intl: React.PropTypes.object.isRequired intl: React.PropTypes.object.isRequired
}, },
@ -27,15 +28,15 @@ const VideoModal = React.createClass({
mixins: [PureRenderMixin], mixins: [PureRenderMixin],
render () { render () {
const { media, intl, onClose } = this.props; const { media, intl, time, onClose } = this.props;
const url = media.get('url'); const url = media.get('url');
return ( return (
<div className='modal-root__modal media-modal'> <div className='modal-root__modal media-modal'>
<div> <div>
<IconButton title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={16} style={closeStyle} /> <div style={closeStyle}><IconButton title={intl.formatMessage(messages.close)} icon='times' overlay onClick={onClose} /></div>
<ExtendedVideoPlayer src={url} muted={false} controls={true} /> <ExtendedVideoPlayer src={url} muted={false} controls={true} time={time} />
</div> </div>
</div> </div>
); );

12
app/assets/stylesheets/components.scss
Unescape View File

@ -112,6 +112,18 @@
color: $color3; color: $color3;
} }
} }
&.overlayed {
box-sizing: content-box;
background: rgba($color8, 0.6);
color: rgba($color5, 0.7);
border-radius: 4px;
padding: 2px;
&:hover {
background: rgba($color8, 0.9);
}
}
} }
.text-icon-button { .text-icon-button {

Write Preview
Loading…
Cancel
Save