|
|
@ -486,13 +486,30 @@ class Status extends ImmutablePureComponent {
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const handlers = {
|
|
|
|
|
|
|
|
reply: this.handleHotkeyReply,
|
|
|
|
|
|
|
|
favourite: this.handleHotkeyFavourite,
|
|
|
|
|
|
|
|
boost: this.handleHotkeyBoost,
|
|
|
|
|
|
|
|
mention: this.handleHotkeyMention,
|
|
|
|
|
|
|
|
open: this.handleHotkeyOpen,
|
|
|
|
|
|
|
|
openProfile: this.handleHotkeyOpenProfile,
|
|
|
|
|
|
|
|
moveUp: this.handleHotkeyMoveUp,
|
|
|
|
|
|
|
|
moveDown: this.handleHotkeyMoveDown,
|
|
|
|
|
|
|
|
toggleSpoiler: this.handleExpandedToggle,
|
|
|
|
|
|
|
|
bookmark: this.handleHotkeyBookmark,
|
|
|
|
|
|
|
|
toggleCollapse: this.handleHotkeyCollapse,
|
|
|
|
|
|
|
|
toggleSensitive: this.handleHotkeyToggleSensitive,
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
if (hidden) {
|
|
|
|
if (hidden) {
|
|
|
|
return (
|
|
|
|
return (
|
|
|
|
<div ref={this.handleRef}>
|
|
|
|
<HotKeys handlers={handlers}>
|
|
|
|
{status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])}
|
|
|
|
<div ref={this.handleRef} className='status focusable' tabIndex='0'>
|
|
|
|
{' '}
|
|
|
|
{status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])}
|
|
|
|
{status.get('content')}
|
|
|
|
{' '}
|
|
|
|
</div>
|
|
|
|
{status.get('content')}
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</HotKeys>
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -628,21 +645,6 @@ class Status extends ImmutablePureComponent {
|
|
|
|
rebloggedByText = intl.formatMessage({ id: 'status.reblogged_by', defaultMessage: '{name} boosted' }, { name: account.get('acct') });
|
|
|
|
rebloggedByText = intl.formatMessage({ id: 'status.reblogged_by', defaultMessage: '{name} boosted' }, { name: account.get('acct') });
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const handlers = {
|
|
|
|
|
|
|
|
reply: this.handleHotkeyReply,
|
|
|
|
|
|
|
|
favourite: this.handleHotkeyFavourite,
|
|
|
|
|
|
|
|
boost: this.handleHotkeyBoost,
|
|
|
|
|
|
|
|
mention: this.handleHotkeyMention,
|
|
|
|
|
|
|
|
open: this.handleHotkeyOpen,
|
|
|
|
|
|
|
|
openProfile: this.handleHotkeyOpenProfile,
|
|
|
|
|
|
|
|
moveUp: this.handleHotkeyMoveUp,
|
|
|
|
|
|
|
|
moveDown: this.handleHotkeyMoveDown,
|
|
|
|
|
|
|
|
toggleSpoiler: this.handleExpandedToggle,
|
|
|
|
|
|
|
|
bookmark: this.handleHotkeyBookmark,
|
|
|
|
|
|
|
|
toggleCollapse: this.handleHotkeyCollapse,
|
|
|
|
|
|
|
|
toggleSensitive: this.handleHotkeyToggleSensitive,
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const computedClass = classNames('status', `status-${status.get('visibility')}`, {
|
|
|
|
const computedClass = classNames('status', `status-${status.get('visibility')}`, {
|
|
|
|
collapsed: isCollapsed,
|
|
|
|
collapsed: isCollapsed,
|
|
|
|
'has-background': isCollapsed && background,
|
|
|
|
'has-background': isCollapsed && background,
|
|
|
|