summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_shared/mixins
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-26 14:38:38 +0100
committerPhil Hughes <me@iamphill.com>2017-05-26 14:38:38 +0100
commit5227ea5bc483359bb8a9a40057587651ecb850c2 (patch)
treeae130526886154458899b886952d948841d0b33d /app/assets/javascripts/vue_shared/mixins
parent7f34b7cb16d7e42d7099712d8ce657e6e395913b (diff)
downloadgitlab-ce-5227ea5bc483359bb8a9a40057587651ecb850c2.tar.gz
fixed up weird karma specs with tooltip
the tooltip mixin was changed because of a weird bug where the tooltip wouldn't show. This was wrong as the bug was actually caused by the text utility method
Diffstat (limited to 'app/assets/javascripts/vue_shared/mixins')
-rw-r--r--app/assets/javascripts/vue_shared/mixins/tooltip.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/assets/javascripts/vue_shared/mixins/tooltip.js b/app/assets/javascripts/vue_shared/mixins/tooltip.js
index 2e3b716a36c..995c0c98505 100644
--- a/app/assets/javascripts/vue_shared/mixins/tooltip.js
+++ b/app/assets/javascripts/vue_shared/mixins/tooltip.js
@@ -1,14 +1,10 @@
export default {
mounted() {
- this.$nextTick(() => {
- $(this.$refs.tooltip).tooltip();
- });
+ $(this.$refs.tooltip).tooltip();
},
updated() {
- this.$nextTick(() => {
- $(this.$refs.tooltip).tooltip('fixTitle');
- });
+ $(this.$refs.tooltip).tooltip('fixTitle');
},
beforeDestroy() {