miklo
/
soapbox
sforkowany z mirror/soapbox
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność

Use description limits from Pleroma 

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
groups
marcin mikołajczak 2021-07-19 23:14:31 +02:00
rodzic 567c4ce093
commit bedc9ef3fa
2 zmienionych plików z 3 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
app/soapbox/features/compose/components/upload.js
Wyświetl plik

@ -92,7 +92,7 @@ class Upload extends ImmutablePureComponent {
} }
render() { render() {
const { intl, media } = this.props; const { intl, media, descriptionLimit } = this.props;
const active = this.state.hovered || this.state.focused; const active = this.state.hovered || this.state.focused;
const description = this.state.dirtyDescription || (this.state.dirtyDescription !== '' && media.get('description')) || ''; const description = this.state.dirtyDescription || (this.state.dirtyDescription !== '' && media.get('description')) || '';
const focusX = media.getIn(['meta', 'focus', 'x']); const focusX = media.getIn(['meta', 'focus', 'x']);
@ -125,7 +125,7 @@ class Upload extends ImmutablePureComponent {
<textarea <textarea
placeholder={intl.formatMessage(messages.description)} placeholder={intl.formatMessage(messages.description)}
value={description} value={description}
maxLength={420} maxLength={descriptionLimit}
onFocus={this.handleInputFocus} onFocus={this.handleInputFocus}
onChange={this.handleInputChange} onChange={this.handleInputChange}
onBlur={this.handleInputBlur} onBlur={this.handleInputBlur}

1
app/soapbox/features/compose/containers/upload_container.js
Wyświetl plik

@ -7,6 +7,7 @@ import { List as ImmutableList } from 'immutable';
const mapStateToProps = (state, { id }) => ({ const mapStateToProps = (state, { id }) => ({
media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id), media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id),
descriptionLimit: state.getIn(['instance', 'description_limit']),
}); });
const mapDispatchToProps = dispatch => ({ const mapDispatchToProps = dispatch => ({