diff options
| author | Zac Anger <zac@zacanger.com> | 2017-04-17 12:30:38 -0600 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-17 20:30:38 +0200 |
| commit | 7b397b14521b34f96acfa7508dba811a1274209d (patch) | |
| tree | d5d5aaa225b6e83ebf626932f5d7adbff454c841 /app/assets | |
| parent | 8fd6552bcaec549ec522b2c40240c51400538001 (diff) | |
Return early from submit if no text. (#1962)
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/components/actions/compose.jsx | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/components/locales/no.jsx | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/actions/compose.jsx b/app/assets/javascripts/components/actions/compose.jsx index 88e91c356..de75ddabe 100644 --- a/app/assets/javascripts/components/actions/compose.jsx +++ b/app/assets/javascripts/components/actions/compose.jsx @@ -73,9 +73,13 @@ export function mentionCompose(account, router) { export function submitCompose() { return function (dispatch, getState) { + const status = emojione.shortnameToUnicode(getState().getIn(['compose', 'text'], '')); + if (!status || !status.length) { + return; + } dispatch(submitComposeRequest()); api(getState).post('/api/v1/statuses', { - status: emojione.shortnameToUnicode(getState().getIn(['compose', 'text'], '')), + status, in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null), media_ids: getState().getIn(['compose', 'media_attachments']).map(item => item.get('id')), sensitive: getState().getIn(['compose', 'sensitive']), diff --git a/app/assets/javascripts/components/locales/no.jsx b/app/assets/javascripts/components/locales/no.jsx index 43715fb5c..c89c5ede6 100644 --- a/app/assets/javascripts/components/locales/no.jsx +++ b/app/assets/javascripts/components/locales/no.jsx @@ -33,7 +33,7 @@ const no = { "empty_column.community": "Den lokale tidslinjen er tom. Skriv noe offentlig for å få snøballen til å rulle!", "empty_column.hashtag": "Det er ingenting i denne hashtagen ennå.", "empty_column.home.public_timeline": "en offentlig tidslinje", - "empty_column.home": "Du har ikke fulgt noen ennå. Besøk {publlic} eller bruk søk for å komme i gang og møte andre brukere.", + "empty_column.home": "Du har ikke fulgt noen ennå. Besøk {publlic} eller bruk søk for å komme i gang og møte andre brukere.", "empty_column.notifications": "Du har ingen varsler ennå. Kommuniser med andre for å begynne samtalen.", "empty_column.public": "Det er ingenting her! Skriv noe offentlig, eller følg brukere manuelt fra andre instanser for å fylle den opp", "follow_request.authorize": "Autorisér", |