diff options
| author | André Luís <aluis@gitlab.com> | 2018-03-21 13:53:56 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-03-22 15:18:48 -0600 |
| commit | 08b14728b1c28c7392f2f88838da0394f69bcb02 (patch) | |
| tree | 66ebaa30dcac30c0b263cd7e0528cda00102b958 | |
| parent | 85699a92292c8fe70ed101f1220d3bbbd6ae69e4 (diff) | |
| download | gitlab-ce-08b14728b1c28c7392f2f88838da0394f69bcb02.tar.gz | |
Revert Vue tooltip adaptation and use it correctly
| -rw-r--r-- | app/assets/javascripts/pipelines/components/graph/job_component.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/directives/tooltip.js | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/app/assets/javascripts/pipelines/components/graph/job_component.vue b/app/assets/javascripts/pipelines/components/graph/job_component.vue index 2fdace6e01a..1b6e02929a5 100644 --- a/app/assets/javascripts/pipelines/components/graph/job_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/job_component.vue @@ -103,7 +103,7 @@ :title="tooltipText" :class="cssClassJobName" data-container="body" - data-html + data-html="true" class="js-pipeline-graph-job-link" > @@ -119,7 +119,7 @@ class="js-job-component-tooltip" :title="tooltipText" :class="cssClassJobName" - data-html + data-html="true" data-container="body" > diff --git a/app/assets/javascripts/vue_shared/directives/tooltip.js b/app/assets/javascripts/vue_shared/directives/tooltip.js index 02ac0aedf4f..b7f7e9fec15 100644 --- a/app/assets/javascripts/vue_shared/directives/tooltip.js +++ b/app/assets/javascripts/vue_shared/directives/tooltip.js @@ -2,13 +2,7 @@ import $ from 'jquery'; export default { bind(el) { - const tooltipOptions = {}; - - if (typeof el.dataset.html !== 'undefined') { - tooltipOptions.html = true; - } - - $(el).tooltip(tooltipOptions); + $(el).tooltip(); }, componentUpdated(el) { |