autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add opening images in a modal window

Browse Source
This commit is contained in:
Eugen Rochko
2016-10-24 18:07:40 +02:00
parent f8f40f15da
commit de50eff6ac
12 changed files with 146 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/components/features/status/components/detailed_status.jsx
View File

@ -14,7 +14,8 @@ const DetailedStatus = React.createClass({
},
propTypes: {
status: ImmutablePropTypes.map.isRequired
status: ImmutablePropTypes.map.isRequired,
onOpenMedia: React.PropTypes.func.isRequired
},
mixins: [PureRenderMixin],
@ -36,7 +37,7 @@ const DetailedStatus = React.createClass({
if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
media = <VideoPlayer media={status.getIn(['media_attachments', 0])} width={317} height={178} />;
} else {
media = <MediaGallery media={status.get('media_attachments')} height={300} />;
media = <MediaGallery media={status.get('media_attachments')} height={300} onOpenMedia={this.props.onOpenMedia} />;
}
}

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

@ -22,6 +22,7 @@ import {
import { ScrollContainer } from 'react-router-scroll';
import ColumnBackButton from '../../components/column_back_button';
import StatusContainer from '../../containers/status_container';
import { openMedia } from '../../actions/modal';
const makeMapStateToProps = () => {
const getStatus = makeGetStatus();
@ -78,6 +79,10 @@ const Status = React.createClass({
this.props.dispatch(mentionCompose(account));
},
handleOpenMedia (url) {
this.props.dispatch(openMedia(url));
},
renderChildren (list) {
return list.map(id => <StatusContainer key={id} id={id} />);
},
@ -112,7 +117,7 @@ const Status = React.createClass({
<div style={{ overflowY: 'scroll', flex: '1 1 auto' }} className='scrollable'>
{ancestors}
<DetailedStatus status={status} me={me} />
<DetailedStatus status={status} me={me} onOpenMedia={this.handleOpenMedia} />
<ActionBar status={status} me={me} onReply={this.handleReplyClick} onFavourite={this.handleFavouriteClick} onReblog={this.handleReblogClick} onDelete={this.handleDeleteClick} onMention={this.handleMentionClick} />
{descendants}