From baaaf4e95979c128779c735a59cc4e0ecade0bf9 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 18 Apr 2017 17:49:21 +0100
Subject: Destroy tooltip in async buttons and tooltips

---
 app/assets/javascripts/environments/components/environment_actions.js   | 2 ++
 app/assets/javascripts/environments/components/environment_rollback.js  | 2 ++
 app/assets/javascripts/environments/components/environment_stop.js      | 2 ++
 app/assets/javascripts/vue_pipelines_index/components/async_button.vue  | 2 ++
 .../javascripts/vue_pipelines_index/components/pipelines_actions.js     | 2 ++
 5 files changed, 10 insertions(+)

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;
-- 
cgit v1.2.1


From 8752b99f88f631d0e63c4795b89d3eec50b21274 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 19 Apr 2017 10:50:06 +0100
Subject: Only destroy the component's tooltip

---
 .../environments/components/environment_actions.js       |  2 +-
 .../environments/components/environment_rollback.js      |  2 +-
 .../environments/components/environment_stop.js          |  2 +-
 .../vue_pipelines_index/components/async_button.vue      | 16 ++++++++++------
 .../vue_pipelines_index/components/pipelines_actions.js  |  2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment_actions.js b/app/assets/javascripts/environments/components/environment_actions.js
index c199c7abcac..1f325d66e87 100644
--- a/app/assets/javascripts/environments/components/environment_actions.js
+++ b/app/assets/javascripts/environments/components/environment_actions.js
@@ -35,7 +35,7 @@ export default {
     onClickAction(endpoint) {
       this.isLoading = true;
 
-      $('.has-tooltip').tooltip('destroy');
+      $(this.$el.querySelector('.has-tooltip')).tooltip('destroy');
 
       this.service.postAction(endpoint)
       .then(() => {
diff --git a/app/assets/javascripts/environments/components/environment_rollback.js b/app/assets/javascripts/environments/components/environment_rollback.js
index 7f3c4b78a51..7cbfb651525 100644
--- a/app/assets/javascripts/environments/components/environment_rollback.js
+++ b/app/assets/javascripts/environments/components/environment_rollback.js
@@ -36,7 +36,7 @@ export default {
     onClick() {
       this.isLoading = true;
 
-      $('.has-tooltip').tooltip('destroy');
+      $(this.$el).tooltip('destroy');
 
       this.service.postAction(this.retryUrl)
       .then(() => {
diff --git a/app/assets/javascripts/environments/components/environment_stop.js b/app/assets/javascripts/environments/components/environment_stop.js
index 949de9a9604..9e5465c1785 100644
--- a/app/assets/javascripts/environments/components/environment_stop.js
+++ b/app/assets/javascripts/environments/components/environment_stop.js
@@ -36,7 +36,7 @@ export default {
       if (confirm('Are you sure you want to stop this environment?')) {
         this.isLoading = true;
 
-        $('.has-tooltip').tooltip('destroy');
+        $(this.$el).tooltip('destroy');
 
         this.service.postAction(this.retryUrl)
         .then(() => {
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 fb1f8a9e2a3..bc42586a770 100644
--- a/app/assets/javascripts/vue_pipelines_index/components/async_button.vue
+++ b/app/assets/javascripts/vue_pipelines_index/components/async_button.vue
@@ -54,7 +54,7 @@ export default {
   },
 
   methods: {
-    onClick() {
+    onClick(e) {
       if (this.confirmActionMessage && confirm(this.confirmActionMessage)) {
         this.makeRequest();
       } else if (!this.confirmActionMessage) {
@@ -65,7 +65,7 @@ export default {
     makeRequest() {
       this.isLoading = true;
 
-      $('.has-tooltip').tooltip('destroy');
+      $(this.$el).tooltip('destroy');
 
       this.service.postAction(this.endpoint)
         .then(() => {
@@ -90,9 +90,13 @@ export default {
     :aria-label="title"
     data-container="body"
     data-placement="top"
-    :disabled="isLoading"
-  >
-    <i :class="iconClass" aria-hidden="true"></i>
-    <i class="fa fa-spinner fa-spin" aria-hidden="true" v-if="isLoading"></i>
+    :disabled="isLoading">
+    <i
+      :class="iconClass"
+      aria-hidden="true" />
+    <i
+      class="fa fa-spinner fa-spin"
+      aria-hidden="true"
+      v-if="isLoading" />
   </button>
 </template>
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 74396d8249b..535064f610e 100644
--- a/app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js
+++ b/app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js
@@ -28,7 +28,7 @@ export default {
     onClickAction(endpoint) {
       this.isLoading = true;
 
-      $('.has-tooltip').tooltip('destroy');
+      $(this.$el.querySelector('.has-tooltip')).tooltip('destroy');
 
       this.service.postAction(endpoint)
       .then(() => {
-- 
cgit v1.2.1


From dbbcb32cfef8d9304afe648bbe13e8b98fc1ee30 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 19 Apr 2017 10:55:24 +0100
Subject: Remove unused argument

---
 app/assets/javascripts/vue_pipelines_index/components/async_button.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 bc42586a770..d1c60b570de 100644
--- a/app/assets/javascripts/vue_pipelines_index/components/async_button.vue
+++ b/app/assets/javascripts/vue_pipelines_index/components/async_button.vue
@@ -54,7 +54,7 @@ export default {
   },
 
   methods: {
-    onClick(e) {
+    onClick() {
       if (this.confirmActionMessage && confirm(this.confirmActionMessage)) {
         this.makeRequest();
       } else if (!this.confirmActionMessage) {
-- 
cgit v1.2.1


From 2afff60982e9ccc4afa80951acda8e754ffde6fe Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 19 Apr 2017 15:30:47 +0100
Subject: Use refs instead of query the DOM

---
 app/assets/javascripts/environments/components/environment_actions.js | 3 ++-
 app/assets/javascripts/pipelines/components/pipelines_actions.js      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment_actions.js b/app/assets/javascripts/environments/components/environment_actions.js
index 1f325d66e87..313e78e573a 100644
--- a/app/assets/javascripts/environments/components/environment_actions.js
+++ b/app/assets/javascripts/environments/components/environment_actions.js
@@ -35,7 +35,7 @@ export default {
     onClickAction(endpoint) {
       this.isLoading = true;
 
-      $(this.$el.querySelector('.has-tooltip')).tooltip('destroy');
+      $(this.$refs.tooltip).tooltip('destroy');
 
       this.service.postAction(endpoint)
       .then(() => {
@@ -64,6 +64,7 @@ export default {
         class="dropdown btn btn-default dropdown-new js-dropdown-play-icon-container has-tooltip"
         data-container="body"
         data-toggle="dropdown"
+        ref="tooltip"
         :title="title"
         :aria-label="title"
         :disabled="isLoading">
diff --git a/app/assets/javascripts/pipelines/components/pipelines_actions.js b/app/assets/javascripts/pipelines/components/pipelines_actions.js
index 535064f610e..ffda18d2e0f 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_actions.js
+++ b/app/assets/javascripts/pipelines/components/pipelines_actions.js
@@ -28,7 +28,7 @@ export default {
     onClickAction(endpoint) {
       this.isLoading = true;
 
-      $(this.$el.querySelector('.has-tooltip')).tooltip('destroy');
+      $(this.$refs.tooltip).tooltip('destroy');
 
       this.service.postAction(endpoint)
       .then(() => {
@@ -59,6 +59,7 @@ export default {
         data-toggle="dropdown"
         data-placement="top"
         aria-label="Manual job"
+        ref="tooltip"
         :disabled="isLoading">
         ${playIconSvg}
         <i
-- 
cgit v1.2.1