diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-06 22:39:22 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-06 22:39:22 +0100 |
commit | cf4fd8bcfe22c8ef8e6e2a86149dec3b39adc93c (patch) | |
tree | 07011d17c72d428717757be2d242072755dff0da /app/javascript | |
parent | 1bb23100b1059879a743302253eafc8317daf215 (diff) | |
parent | 96f905f40913b915496039d188297a7949b1a6db (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/mastodon/actions/compose.js | 7 | ||||
-rw-r--r-- | app/javascript/mastodon/components/icon_button.js | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js index 2d58a71fe..da7bd3cb0 100644 --- a/app/javascript/mastodon/actions/compose.js +++ b/app/javascript/mastodon/actions/compose.js @@ -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()) { diff --git a/app/javascript/mastodon/components/icon_button.js b/app/javascript/mastodon/components/icon_button.js index fbb42f78f..9d8a8d06b 100644 --- a/app/javascript/mastodon/components/icon_button.js +++ b/app/javascript/mastodon/components/icon_button.js @@ -86,6 +86,7 @@ export default class IconButton extends React.PureComponent { onClick={this.handleClick} style={style} tabIndex={tabIndex} + disabled={disabled} > <Icon id={icon} fixedWidth aria-hidden='true' /> </button> @@ -104,6 +105,7 @@ export default class IconButton extends React.PureComponent { onClick={this.handleClick} style={style} tabIndex={tabIndex} + disabled={disabled} > <Icon id={icon} style={{ transform: `rotate(${rotate}deg)` }} fixedWidth aria-hidden='true' /> </button> |