Split out is_changing_upload from is_submitting

Fixes #855

diff --git a/app/javascript/flavours/glitch/features/composer/index.js b/app/javascript/flavours/glitch/features/composer/index.js
index 40eae1f539a1f1ccadadcd84dd82e279e4735ea8..a8f5a5c3cde6195639168fafe3d72b3f32c1286b 100644 (file)
--- a/app/javascript/flavours/glitch/features/composer/index.js
+++ b/app/javascript/flavours/glitch/features/composer/index.js
@@ -81,6 +81,7 @@ function mapStateToProps (state) {
     focusDate: state.getIn(['compose', 'focusDate']),
     caretPosition: state.getIn(['compose', 'caretPosition']),
     isSubmitting: state.getIn(['compose', 'is_submitting']),
+    isChangingUpload: state.getIn(['compose', 'is_changing_upload']),
     isUploading: state.getIn(['compose', 'is_uploading']),
     layout: state.getIn(['local_settings', 'layout']),
     media: state.getIn(['compose', 'media_attachments']),
@@ -228,6 +229,7 @@ const handlers = {
       onChangeText,
       onSubmit,
       isSubmitting,
+      isChangingUpload,
       isUploading,
       media,
       anyMedia,
@@ -243,7 +245,7 @@ const handlers = {
     }
 
     // Submit disabled:
-    if (isSubmitting || isUploading || (!text.trim().length && !anyMedia)) {
+    if (isSubmitting || isUploading || isChangingUpload || (!text.trim().length && !anyMedia)) {
       return;
     }
 
@@ -386,6 +388,7 @@ class Composer extends React.Component {
       anyMedia,
       intl,
       isSubmitting,
+      isChangingUpload,
       isUploading,
       layout,
       media,
@@ -418,7 +421,7 @@ class Composer extends React.Component {
       spoilersAlwaysOn,
     } = this.props;
 
-    let disabledButton = isSubmitting || isUploading || (!text.trim().length && !anyMedia);
+    let disabledButton = isSubmitting || isUploading || isChangingUpload || (!text.trim().length && !anyMedia);
 
     return (
       <div className='composer'>
@@ -518,6 +521,7 @@ Composer.propTypes = {
   focusDate: PropTypes.instanceOf(Date),
   caretPosition: PropTypes.number,
   isSubmitting: PropTypes.bool,
+  isChangingUpload: PropTypes.bool,
   isUploading: PropTypes.bool,
   layout: PropTypes.string,
   media: ImmutablePropTypes.list,

diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js
index 0ddff707ea4ae45a53ad4bc2c9058c560b2668d3..7281cbd61e44054c66459fdca4a3a2eab0febd65 100644 (file)
--- a/app/javascript/flavours/glitch/reducers/compose.js
+++ b/app/javascript/flavours/glitch/reducers/compose.js
@@ -67,6 +67,7 @@ const initialState = ImmutableMap({
   in_reply_to: null,
   is_submitting: false,
   is_uploading: false,
+  is_changing_upload: false,
   progress: 0,
   media_attachments: ImmutableList(),
   suggestion_token: null,
@@ -130,6 +131,7 @@ function clearAll(state) {
     map.set('spoiler', false);
     map.set('spoiler_text', '');
     map.set('is_submitting', false);
+    map.set('is_changing_upload', false);
     map.set('in_reply_to', null);
     map.update(
       'advanced_options',
@@ -341,13 +343,15 @@ export default function compose(state = initialState, action) {
       map.set('idempotencyKey', uuid());
     });
   case COMPOSE_SUBMIT_REQUEST:
-  case COMPOSE_UPLOAD_CHANGE_REQUEST:
     return state.set('is_submitting', true);
+  case COMPOSE_UPLOAD_CHANGE_REQUEST:
+    return state.set('is_changing_upload', true);
   case COMPOSE_SUBMIT_SUCCESS:
     return action.status && state.getIn(['advanced_options', 'threaded_mode']) ? continueThread(state, action.status) : clearAll(state);
   case COMPOSE_SUBMIT_FAIL:
-  case COMPOSE_UPLOAD_CHANGE_FAIL:
     return state.set('is_submitting', false);
+  case COMPOSE_UPLOAD_CHANGE_FAIL:
+    return state.set('is_changing_upload', false);
   case COMPOSE_UPLOAD_REQUEST:
     return state.set('is_uploading', true);
   case COMPOSE_UPLOAD_SUCCESS:
@@ -393,7 +397,7 @@ export default function compose(state = initialState, action) {
     return insertEmoji(state, action.position, action.emoji);
   case COMPOSE_UPLOAD_CHANGE_SUCCESS:
     return state
-      .set('is_submitting', false)
+      .set('is_changing_upload', false)
       .update('media_attachments', list => list.map(item => {
         if (item.get('id') === action.media.id) {
           return fromJS(action.media);