diff options
author | André Luís <aluis@gitlab.com> | 2018-11-02 16:48:24 +0000 |
---|---|---|
committer | André Luís <aluis@gitlab.com> | 2018-11-03 21:37:19 +0000 |
commit | 105169436129fa5cebd94de4210bd9fdf18b7daf (patch) | |
tree | e58a4184910027b312c03248462075dfd57a1b54 | |
parent | 815dc1f8045e19d3f9a09ace8e03607f1cb836d9 (diff) | |
download | gitlab-ce-105169436129fa5cebd94de4210bd9fdf18b7daf.tar.gz |
Improve jumpToDiscussion re: expanding discussion
-rw-r--r-- | app/assets/javascripts/notes/mixins/discussion_navigation.js | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/app/assets/javascripts/notes/mixins/discussion_navigation.js b/app/assets/javascripts/notes/mixins/discussion_navigation.js index f7c4deee1f8..2c9570952b2 100644 --- a/app/assets/javascripts/notes/mixins/discussion_navigation.js +++ b/app/assets/javascripts/notes/mixins/discussion_navigation.js @@ -9,21 +9,25 @@ export default { activeTab === 'diffs' ? `ul.notes[data-discussion-id="${id}"]` : `div.discussion[data-discussion-id="${id}"]`; - const el = document.querySelector(selector); - if (activeTab === 'commits' || activeTab === 'pipelines') { - window.mrTabs.activateTab('show'); - } + this.expandDiscussion({ discussionId: id }); - if (el) { - this.expandDiscussion({ discussionId: id }); + this.$nextTick(() => { + const el = document.querySelector(selector); - scrollToElement(el); - return true; - } - } + if (activeTab === 'commits' || activeTab === 'pipelines') { + window.mrTabs.activateTab('show'); + } + + if (el) { + scrollToElement(el); - return false; + return true; + } + + return false; + }); + } }, }, }; |