Skip to content

Fix loading content history on show more #17819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Dec 6, 2021
Merged

Fix loading content history on show more #17819

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
97829ed
Fix loading content history on show more
Nov 25, 2021
652e4e7
Merge branch 'main' into fix-contenthistory-show-more
lunny Nov 27, 2021
fa3d22c
Merge branch 'main' into fix-contenthistory-show-more
zeripath Nov 30, 2021
cc3696d
Merge branch 'main' into fix-contenthistory-show-more
lunny Dec 1, 2021
cbc24c8
apply history to show diff too
zeripath Dec 2, 2021
be4ee3b
Merge remote-tracking branch 'origin/main' into fix-contenthistory-sh…
zeripath Dec 2, 2021
f04ecdc
Merge branch 'main' into fix-contenthistory-show-more
6543 Dec 3, 2021
392841b
Merge branch 'main' into fix-contenthistory-show-more
lunny Dec 5, 2021
1094e22
Merge branch 'main' into fix-contenthistory-show-more
6543 Dec 5, 2021
86dd6cc
Merge branch 'main' into fix-contenthistory-show-more
lunny Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion web_src/js/features/repo-diff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {initCompReactionSelector} from './comp/ReactionSelector.js';

import {initRepoIssueContentHistory} from './repo-issue-content.js';
const {csrfToken} = window.config;

export function initRepoDiffReviewButton() {
Expand Down Expand Up @@ -101,6 +101,7 @@ export function initRepoDiffShowMore() {
$('#diff-too-many-files-stats').remove();
$('#diff-files').append($(resp).find('#diff-files li'));
$('#diff-incomplete').replaceWith($(resp).find('#diff-file-boxes').children());
initRepoIssueContentHistory();
}).fail(() => {
$('#diff-show-more-files, #diff-show-more-files-stats').removeClass('disabled');
});
Expand All @@ -126,6 +127,7 @@ export function initRepoDiffShowMore() {
}

$target.parent().replaceWith($(resp).find('#diff-file-boxes .diff-file-body .file-body').children());
initRepoIssueContentHistory();
}).fail(() => {
$target.removeClass('disabled');
});
Expand Down