diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-04-02 17:58:11 +0200 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-04-02 18:02:29 +0200 |
| commit | 49ff656add31733e9e46650d30e22b126b2e6948 (patch) | |
| tree | 6a5f11eef747bf1a9399cf16465620d2b4a356e5 | |
| parent | 697121f94fb9b0c0a070d74ce57eb1ddc86c9e5e (diff) | |
| download | gitlab-ce-40907-confidential-lock-icons-collapsed-sidebar.tar.gz | |
close form and sidebar before page refresh40907-confidential-lock-icons-collapsed-sidebar
| -rw-r--r-- | app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue | 10 | ||||
| -rw-r--r-- | app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue b/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue index de3a98d7b45..38b1ddbfd5b 100644 --- a/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue +++ b/app/assets/javascripts/sidebar/components/confidential/edit_form_buttons.vue @@ -22,10 +22,14 @@ export default { }, }, methods: { - cancelForm() { + closeForm() { eventHub.$emit('closeConfidentialityForm'); $(this.$el).trigger('hidden.gl.dropdown'); }, + submitForm() { + this.closeForm(); + this.updateConfidentialAttribute(this.updateConfidentialBool); + }, }, }; </script> @@ -35,14 +39,14 @@ export default { <button type="button" class="btn btn-default append-right-10" - @click="cancelForm" + @click="closeForm" > {{ __('Cancel') }} </button> <button type="button" class="btn btn-close" - @click.prevent="updateConfidentialAttribute(updateConfidentialBool)" + @click.prevent="submitForm" > {{ toggleButtonText }} </button> diff --git a/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue b/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue index 389cc53450d..5e7b8f9698f 100644 --- a/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue +++ b/app/assets/javascripts/sidebar/components/lock/edit_form_buttons.vue @@ -26,10 +26,14 @@ export default { }, methods: { - cancelForm() { + closeForm() { eventHub.$emit('closeLockForm'); $(this.$el).trigger('hidden.gl.dropdown'); }, + submitForm() { + this.closeForm(); + this.updateLockedAttribute(this.toggleLock); + }, }, }; </script> @@ -39,7 +43,7 @@ export default { <button type="button" class="btn btn-default append-right-10" - @click="cancelForm" + @click="closeForm" > {{ __('Cancel') }} </button> @@ -47,7 +51,7 @@ export default { <button type="button" class="btn btn-close" - @click.prevent="updateLockedAttribute(toggleLock)" + @click.prevent="submitForm" > {{ buttonText }} </button> |