diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 13:18:24 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 13:18:24 +0000 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/assets/javascripts/mr_notes | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
download | gitlab-ce-0653e08efd039a5905f3fa4f6e9cef9f5d2f799c.tar.gz |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/assets/javascripts/mr_notes')
-rw-r--r-- | app/assets/javascripts/mr_notes/index.js | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/app/assets/javascripts/mr_notes/index.js b/app/assets/javascripts/mr_notes/index.js index a7696a716d0..ea3e4e5604c 100644 --- a/app/assets/javascripts/mr_notes/index.js +++ b/app/assets/javascripts/mr_notes/index.js @@ -19,6 +19,7 @@ export default function initMrNotes() { action: mrShowNode.dataset.mrAction, }); + initDiffsApp(store); initNotesApp(); document.addEventListener('merged:UpdateActions', () => { @@ -26,20 +27,25 @@ export default function initMrNotes() { initCherryPickCommitModal(); }); - // eslint-disable-next-line no-new - new Vue({ - el: '#js-vue-discussion-counter', - name: 'DiscussionCounter', - components: { - discussionCounter, - }, - store, - render(createElement) { - return createElement('discussion-counter'); - }, - }); + requestIdleCallback(() => { + const el = document.getElementById('js-vue-discussion-counter'); - initDiscussionFilters(store); - initSortDiscussions(store); - initDiffsApp(store); + if (el) { + // eslint-disable-next-line no-new + new Vue({ + el, + name: 'DiscussionCounter', + components: { + discussionCounter, + }, + store, + render(createElement) { + return createElement('discussion-counter'); + }, + }); + } + + initDiscussionFilters(store); + initSortDiscussions(store); + }); } |