diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/post_status_form/post_status_form.js | 5 | ||||
| -rw-r--r-- | src/i18n/messages.js | 2 | ||||
| -rw-r--r-- | src/modules/statuses.js | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 3348445f..6c95873c 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -240,7 +240,10 @@ const PostStatusForm = { resize (e) { const target = e.target || e target.style.height = 'auto' - target.style.height = `${target.scrollHeight - 10}px` + const heightPx = target.scrollHeight - 10 + if (heightPx > 54) { + target.style.height = `${target.scrollHeight - 10}px` + } if (target.value === '') { target.style.height = '16px' } diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 5a6880e8..45a22b63 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -286,7 +286,7 @@ const en = { streaming: 'Enable automatic streaming of new posts when scrolled to the top', reply_link_preview: 'Enable reply-link preview on mouse hover', follow_import: 'Follow import', - import_followers_from_a_csv_file: 'Import followers from a csv file', + import_followers_from_a_csv_file: 'Import follows from a csv file', follows_imported: 'Follows imported! Processing them will take a while.', follow_import_error: 'Error importing followers' }, diff --git a/src/modules/statuses.js b/src/modules/statuses.js index 744d514f..bd52f161 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -44,6 +44,9 @@ export const prepareStatus = (status) => { // Parse nsfw tags if (status.nsfw === undefined) { status.nsfw = isNsfw(status) + if (status.retweeted_status) { + status.retweeted_status.nsfw = status.nsfw + } } // Set deleted flag |