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

Defer tooltip update on Resolve Comment button after DOM cycle Closes #25957 See merge request !8335

Merge branch '25957-marking-a-diff-discussion-as-resolved-doesn-t-update-tooltips' into 'master'
12b6fdb1 · Fatih Acet · 6f91c3ce · 33251af3 · 12b6fdb1
Commit 12b6fdb1 authored Dec 28, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

resolve_btn.js.es6 ...sets/javascripts/diff_notes/components/resolve_btn.js.es6 +6 -4

No files found.
--- a/app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
+++ b/app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
@@ -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();
        });
      }
    },