1 files changed, 4 insertions, 14 deletions
diff --git a/app/assets/javascripts/issue_show/components/edit_actions.vue b/app/assets/javascripts/issue_show/components/edit_actions.vue
index df93d18774f..0750d21c15d 100644
--- a/app/assets/javascripts/issue_show/components/edit_actions.vue
+++ b/app/assets/javascripts/issue_show/components/edit_actions.vue
@@ -15,7 +15,6 @@
     data() {
       return {
         deleteLoading: false,
-        updateLoading: false,
       };
     },
     computed: {
@@ -24,11 +23,8 @@
       },
     },
     methods: {
-      enableSubmit() {
-        this.updateLoading = false;
-      },
       updateIssuable() {
-        this.updateLoading = true;
+        this.formState.updateLoading = true;
         eventHub.$emit('update.issuable');
       },
       closeForm() {
@@ -43,12 +39,6 @@
         }
       },
     },
-    created() {
-      eventHub.$on('enable.submit.btn', this.enableSubmit);
-    },
-    beforeDestroy() {
-      eventHub.$off('enable.submit.btn', this.enableSubmit);
-    },
   };
 </script>
 
@@ -56,15 +46,15 @@
   <div class="prepend-top-default append-bottom-default clearfix">
     <button
       class="btn btn-save pull-left"
-      :class="{ disabled: updateLoading || !isSubmitEnabled }"
+      :class="{ disabled: formState.updateLoading || !isSubmitEnabled }"
       type="submit"
-      :disabled="updateLoading || !isSubmitEnabled"
+      :disabled="formState.updateLoading || !isSubmitEnabled"
       @click.prevent="updateIssuable">
       Save changes
       <i
         class="fa fa-spinner fa-spin"
         aria-hidden="true"
-        v-if="updateLoading">
+        v-if="formState.updateLoading">
       </i>
     </button>
     <button