summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-04-18 17:49:21 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-04-18 17:49:21 +0100
commitbaaaf4e95979c128779c735a59cc4e0ecade0bf9 (patch)
tree2010de6eb9d1850fa8419d54d219deafb411f6a0
parentaecaaa67c3d84637e6c691ed07b44115330dddcb (diff)
downloadgitlab-ce-baaaf4e95979c128779c735a59cc4e0ecade0bf9.tar.gz
Destroy tooltip in async buttons and tooltips
-rw-r--r--app/assets/javascripts/environments/components/environment_actions.js2
-rw-r--r--app/assets/javascripts/environments/components/environment_rollback.js2
-rw-r--r--app/assets/javascripts/environments/components/environment_stop.js2
-rw-r--r--app/assets/javascripts/vue_pipelines_index/components/async_button.vue2
-rw-r--r--app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js2
5 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/javascripts/environments/components/environment_actions.js b/app/assets/javascripts/environments/components/environment_actions.js
index 1418e8d86ee..c199c7abcac 100644
--- a/app/assets/javascripts/environments/components/environment_actions.js
+++ b/app/assets/javascripts/environments/components/environment_actions.js
@@ -35,6 +35,8 @@ export default {
onClickAction(endpoint) {
this.isLoading = true;
+ $('.has-tooltip').tooltip('destroy');
+
this.service.postAction(endpoint)
.then(() => {
this.isLoading = false;
diff --git a/app/assets/javascripts/environments/components/environment_rollback.js b/app/assets/javascripts/environments/components/environment_rollback.js
index baa15d9e5b5..7f3c4b78a51 100644
--- a/app/assets/javascripts/environments/components/environment_rollback.js
+++ b/app/assets/javascripts/environments/components/environment_rollback.js
@@ -36,6 +36,8 @@ export default {
onClick() {
this.isLoading = true;
+ $('.has-tooltip').tooltip('destroy');
+
this.service.postAction(this.retryUrl)
.then(() => {
this.isLoading = false;
diff --git a/app/assets/javascripts/environments/components/environment_stop.js b/app/assets/javascripts/environments/components/environment_stop.js
index 47102692024..949de9a9604 100644
--- a/app/assets/javascripts/environments/components/environment_stop.js
+++ b/app/assets/javascripts/environments/components/environment_stop.js
@@ -36,6 +36,8 @@ export default {
if (confirm('Are you sure you want to stop this environment?')) {
this.isLoading = true;
+ $('.has-tooltip').tooltip('destroy');
+
this.service.postAction(this.retryUrl)
.then(() => {
this.isLoading = false;
diff --git a/app/assets/javascripts/vue_pipelines_index/components/async_button.vue b/app/assets/javascripts/vue_pipelines_index/components/async_button.vue
index 11da6e908b7..fb1f8a9e2a3 100644
--- a/app/assets/javascripts/vue_pipelines_index/components/async_button.vue
+++ b/app/assets/javascripts/vue_pipelines_index/components/async_button.vue
@@ -65,6 +65,8 @@ export default {
makeRequest() {
this.isLoading = true;
+ $('.has-tooltip').tooltip('destroy');
+
this.service.postAction(this.endpoint)
.then(() => {
this.isLoading = false;
diff --git a/app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js b/app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js
index 12d80768646..74396d8249b 100644
--- a/app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js
+++ b/app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js
@@ -28,6 +28,8 @@ export default {
onClickAction(endpoint) {
this.isLoading = true;
+ $('.has-tooltip').tooltip('destroy');
+
this.service.postAction(endpoint)
.then(() => {
this.isLoading = false;