diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-19 17:38:54 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-04-19 17:38:54 +0100 |
| commit | c539480d55ce1114aba189fec01b403ec1499f2e (patch) | |
| tree | da4abfae825e9c9ff027540bbf7c8156ae5c5bc4 /app/assets/javascripts/pipelines | |
| parent | c188841f3ce8c944fc86c3ba7f16a87d1be843be (diff) | |
| parent | 29ddc15f8d9b094bb7052875f7728ee48f7ad06b (diff) | |
| download | gitlab-ce-environments-vue-2.tar.gz | |
Merge branch 'master' into environments-vue-2environments-vue-2
* master:
Remove node modules cache because we already use artifacts
Added and updated droplab docs
Display issuable state only in notes and issuable description
Use refs instead of query the DOM
Remove unused argument
Only destroy the component's tooltip
Fixed project & group icons not being clickable
Destroy tooltip in async buttons and tooltips
Diffstat (limited to 'app/assets/javascripts/pipelines')
| -rw-r--r-- | app/assets/javascripts/pipelines/components/async_button.vue | 14 | ||||
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_actions.js | 3 |
2 files changed, 13 insertions, 4 deletions
diff --git a/app/assets/javascripts/pipelines/components/async_button.vue b/app/assets/javascripts/pipelines/components/async_button.vue index 11da6e908b7..d1c60b570de 100644 --- a/app/assets/javascripts/pipelines/components/async_button.vue +++ b/app/assets/javascripts/pipelines/components/async_button.vue @@ -65,6 +65,8 @@ export default { makeRequest() { this.isLoading = true; + $(this.$el).tooltip('destroy'); + this.service.postAction(this.endpoint) .then(() => { this.isLoading = false; @@ -88,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/pipelines/components/pipelines_actions.js b/app/assets/javascripts/pipelines/components/pipelines_actions.js index 12d80768646..ffda18d2e0f 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_actions.js +++ b/app/assets/javascripts/pipelines/components/pipelines_actions.js @@ -28,6 +28,8 @@ export default { onClickAction(endpoint) { this.isLoading = true; + $(this.$refs.tooltip).tooltip('destroy'); + this.service.postAction(endpoint) .then(() => { this.isLoading = false; @@ -57,6 +59,7 @@ export default { data-toggle="dropdown" data-placement="top" aria-label="Manual job" + ref="tooltip" :disabled="isLoading"> ${playIconSvg} <i |