kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '25957-marking-a-diff-discussion-as-resolved-doesn-t-update-tooltips' into 'master'

Browse source 
Defer tooltip update on Resolve Comment button after DOM cycle

Closes #25957

See merge request !8335
This commit is contained in:
Fatih Acet 2016-12-28 18:49:19 +00:00
commit 12b6fdb194
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
View file

@ -59,9 +59,11 @@
},
methods: {
updateTooltip: function () {
$(this.$refs.button)
.tooltip('hide')
.tooltip('fixTitle');
this.$nextTick(() => {
$(this.$refs.button)
.tooltip('hide')
.tooltip('fixTitle');
});
},
resolve: function () {
if (!this.canResolve) return;
@ -90,7 +92,7 @@
new Flash('An error occurred when trying to resolve a comment. Please try again.', 'alert');
}
this.$nextTick(this.updateTooltip);
this.updateTooltip();
});
}
},