Browse Source

Disable file upload when there is a poll (#10195)

master
ThibG 5 years ago
committed by Eugen Rochko
parent
commit
cb217444b8
1 changed files with 7 additions and 0 deletions
  1. +7
    -0
      app/javascript/mastodon/actions/compose.js

+ 7
- 0
app/javascript/mastodon/actions/compose.js View File

@ -60,6 +60,7 @@ export const COMPOSE_POLL_SETTINGS_CHANGE = 'COMPOSE_POLL_SETTINGS_CHANGE';
const messages = defineMessages({
uploadErrorLimit: { id: 'upload_error.limit', defaultMessage: 'File upload limit exceeded.' },
uploadErrorPoll: { id: 'upload_error.poll', defaultMessage: 'File upload not allowed with polls.' },
});
export function changeCompose(text) {
@ -207,6 +208,12 @@ export function uploadCompose(files) {
dispatch(showAlert(undefined, messages.uploadErrorLimit));
return;
}
if (getState().getIn(['compose', 'poll'])) {
dispatch(showAlert(undefined, messages.uploadErrorPoll));
return;
}
dispatch(uploadComposeRequest());
for (const [i, f] of Array.from(files).entries()) {

Loading…
Cancel
Save