summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-06-11 09:19:58 +0000
committerPhil Hughes <me@iamphill.com>2018-06-11 09:19:58 +0000
commita239936a4d16836670399952b91a18e1b2a35dc9 (patch)
tree13b2f6646db8300dc9539282b230d627a980e980
parentf268da8412fbbec044b1d981f37c7c451059bae9 (diff)
parent24a272f98cc43e65da3771872fc126e7a92bc4ae (diff)
downloadgitlab-ce-a239936a4d16836670399952b91a18e1b2a35dc9.tar.gz
Merge branch '44742-tech-debt' into 'master'
Resolve "`TimeTrackingComparisonPane` vue component tech debt" Closes #44742 See merge request gitlab-org/gitlab-ce!19593
-rw-r--r--app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue11
1 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
index 6f79310b1cc..0e139cd7f5e 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue
@@ -1,8 +1,12 @@
<script>
import { parseSeconds, stringifyTime } from '../../../lib/utils/pretty_time';
+import tooltip from '../../../vue_shared/directives/tooltip';
export default {
name: 'TimeTrackingComparisonPane',
+ directives: {
+ tooltip,
+ },
props: {
timeSpent: {
type: Number,
@@ -51,17 +55,12 @@ export default {
<div class="time-tracking-comparison-pane">
<div
class="compare-meter"
- data-toggle="tooltip"
- data-placement="top"
- role="timeRemainingDisplay"
- :aria-valuenow="timeRemainingTooltip"
:title="timeRemainingTooltip"
- :data-original-title="timeRemainingTooltip"
+ v-tooltip
:class="timeRemainingStatusClass"
>
<div
class="meter-container"
- role="timeSpentPercent"
:aria-valuenow="timeRemainingPercent"
>
<div