diff --git a/templates/repo/diff/blob_excerpt.tmpl b/templates/repo/diff/blob_excerpt.tmpl index 72a1e786a3..01f1e4b866 100644 --- a/templates/repo/diff/blob_excerpt.tmpl +++ b/templates/repo/diff/blob_excerpt.tmpl @@ -126,6 +126,13 @@ {{template "repo/diff/conversation" dict "." $ "comments" $line.Comments}} + + {{end}} {{end}} {{end}} diff --git a/web_src/js/features/repo-diff.ts b/web_src/js/features/repo-diff.ts index f39de96f5b..403b5f8689 100644 --- a/web_src/js/features/repo-diff.ts +++ b/web_src/js/features/repo-diff.ts @@ -19,6 +19,7 @@ import { import {POST, GET} from '../modules/fetch.ts'; import {fomanticQuery} from '../modules/fomantic/base.ts'; import {createTippy} from '../modules/tippy.ts'; +import {initGlobalDropdown} from './common-page.ts'; const {pageData, i18n} = window.config; @@ -94,6 +95,13 @@ function initRepoDiffConversationForm() { } }); + $(document).on('click', '.pull-request-diff-comments', async (e) => { + e.preventDefault(); + initGlobalDropdown(); + // post initiation cleaning up the buttons and scripts + $('.pull-request-diff-comments').remove(); + }); + $(document).on('click', '.resolve-conversation', async function (e) { e.preventDefault(); const comment_id = $(this).data('comment-id');