Add option to hide action bar in collapsed toots

lolsob-rspec
Spencer Alves 2018-09-29 16:44:02 -07:00 committed by ThibG
parent d698c06aa8
commit 981a41ca2c
4 changed files with 15 additions and 1 deletions

View File

@ -566,7 +566,7 @@ export default class Status extends ImmutablePureComponent {
parseClick={parseClick}
disabled={!router}
/>
{!isCollapsed || !muted ? (
{!isCollapsed || !(muted || !settings.getIn(['collapsed', 'show_action_bar'])) ? (
<StatusActionBar
{...other}
status={status}

View File

@ -269,6 +269,18 @@ export default class LocalSettingsPage extends React.PureComponent {
<FormattedMessage id='settings.image_backgrounds_media' defaultMessage='Preview collapsed toot media' />
</LocalSettingsPageItem>
</section>
<section>
<h2></h2>
<LocalSettingsPageItem
settings={settings}
item={['collapsed', 'show_action_bar']}
id='mastodon-settings--collapsed-show-action-bar'
onChange={onChange}
dependsOn={[['collapsed', 'enabled']]}
>
<FormattedMessage id='settings.show_action_bar' defaultMessage='Show action buttons in collapsed toots' />
</LocalSettingsPageItem>
</section>
</div>
),
({ onChange, settings }) => (

View File

@ -18,6 +18,7 @@ const messages = {
'settings.auto_collapse_notifications': 'Notifications',
'settings.auto_collapse_reblogs': 'Boosts',
'settings.auto_collapse_replies': 'Replies',
'settings.show_action_bar': 'Show action buttons in collapsed toots',
'settings.close': 'Close',
'settings.collapsed_statuses': 'Collapsed toots',
'settings.enable_collapsed': 'Enable collapsed toots',

View File

@ -33,6 +33,7 @@ const initialState = ImmutableMap({
user_backgrounds : false,
preview_images : false,
}),
show_action_bar : true,
}),
media : ImmutableMap({
letterbox : true,