mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-27 22:23:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adds spoiler hotkey support to detailed statuses

Browse source
This commit is contained in:
kibigo! 2017-11-27 14:05:03 -08:00
parent f3c3df62ab
commit 6a48efe16c
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/themes/glitch/features/status/components/detailed_status.js
View file

@ -41,7 +41,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
render () {
const status = this.props.status.get('reblog') ? this.props.status.get('reblog') : this.props.status;
const { settings } = this.props;
const { expanded, setExpansion, settings } = this.props;
let media = '';
let mediaIcon = null;
@ -109,6 +109,8 @@ export default class DetailedStatus extends ImmutablePureComponent {
status={status}
media={media}
mediaIcon={mediaIcon}
expanded={expanded}
setExpansion={setExpansion}
/>
<div className='detailed-status__meta'>

17
app/javascript/themes/glitch/features/status/index.js
View file

@ -71,6 +71,7 @@ export default class Status extends ImmutablePureComponent {
state = {
fullscreen: false,
isExpanded: null,
};
componentWillMount () {
@ -88,6 +89,12 @@ export default class Status extends ImmutablePureComponent {
}
}
handleExpandedToggle = () => {
if (this.props.status.get('spoiler_text')) {
this.setExpansion(this.state.isExpanded ? null : true);
}
};
handleFavouriteClick = (status) => {
if (status.get('favourited')) {
this.props.dispatch(unfavourite(status));
@ -241,6 +248,10 @@ export default class Status extends ImmutablePureComponent {
));
}
setExpansion = value => {
this.setState({ isExpanded: value ? true : null });
}
setRef = c => {
this.node = c;
}
@ -272,8 +283,9 @@ export default class Status extends ImmutablePureComponent {
render () {
let ancestors, descendants;
const { setExpansion } = this;
const { status, settings, ancestorsIds, descendantsIds } = this.props;
const { fullscreen } = this.state;
const { fullscreen, isExpanded } = this.state;
if (status === null) {
return (
@ -300,6 +312,7 @@ export default class Status extends ImmutablePureComponent {
boost: this.handleHotkeyBoost,
mention: this.handleHotkeyMention,
openProfile: this.handleHotkeyOpenProfile,
toggleSpoiler: this.handleExpandedToggle,
};
return (
@ -317,6 +330,8 @@ export default class Status extends ImmutablePureComponent {
settings={settings}
onOpenVideo={this.handleOpenVideo}
onOpenMedia={this.handleOpenMedia}
expanded={isExpanded}
setExpansion={setExpansion}
/>
<ActionBar