OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

typo: collapsable -> collapsible (#24521)

pull/24526/head
Nick Schonning 2023-04-14 05:01:23 -04:00 committed by GitHub
parent af49d93fd6
commit d02aa274be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/components/status.jsx
View File

@ -541,7 +541,7 @@ class Status extends ImmutablePureComponent {
expanded={!status.get('hidden')} expanded={!status.get('hidden')}
onExpandedToggle={this.handleExpandedToggle} onExpandedToggle={this.handleExpandedToggle}
onTranslate={this.handleTranslate} onTranslate={this.handleTranslate}
collapsable collapsible
onCollapsedToggle={this.handleCollapsedToggle} onCollapsedToggle={this.handleCollapsedToggle}
/> />

6
app/javascript/mastodon/components/status_content.jsx
View File

@ -65,7 +65,7 @@ class StatusContent extends React.PureComponent {
onExpandedToggle: PropTypes.func, onExpandedToggle: PropTypes.func,
onTranslate: PropTypes.func, onTranslate: PropTypes.func,
onClick: PropTypes.func, onClick: PropTypes.func,
collapsable: PropTypes.bool, collapsible: PropTypes.bool,
onCollapsedToggle: PropTypes.func, onCollapsedToggle: PropTypes.func,
languages: ImmutablePropTypes.map, languages: ImmutablePropTypes.map,
intl: PropTypes.object, intl: PropTypes.object,
@ -112,10 +112,10 @@ class StatusContent extends React.PureComponent {
} }
if (status.get('collapsed', null) === null && onCollapsedToggle) { if (status.get('collapsed', null) === null && onCollapsedToggle) {
const { collapsable, onClick } = this.props; const { collapsible, onClick } = this.props;
const collapsed = const collapsed =
collapsable collapsible
&& onClick && onClick
&& node.clientHeight > MAX_HEIGHT && node.clientHeight > MAX_HEIGHT
&& status.get('spoiler_text').length === 0; && status.get('spoiler_text').length === 0;

2
app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
View File

@ -165,7 +165,7 @@ class Conversation extends ImmutablePureComponent {
onClick={this.handleClick} onClick={this.handleClick}
expanded={!lastStatus.get('hidden')} expanded={!lastStatus.get('hidden')}
onExpandedToggle={this.handleShowMore} onExpandedToggle={this.handleShowMore}
collapsable collapsible
/> />
{lastStatus.get('media_attachments').size > 0 && ( {lastStatus.get('media_attachments').size > 0 && (