TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

make show stats work when only one file changed (#32244)

Browse source 
fix https://github.com/go-gitea/gitea/issues/32226

in https://github.com/go-gitea/gitea/pull/27775 , it do some changes to
only show diff file tree when more than one file changed. But looks it
also break the `diff-file-list` logic, which looks not expected change.
so try fix it.

/cc @silverwind

example view:

![image](https://github.com/user-attachments/assets/281e9c4f-a269-4d36-94eb-a132058aea87)

Signed-off-by: a1012112796 <1012112796@qq.com>
(cherry picked from commit c4b2808b896dd86323c6a0d119c8cf24752d4d8a)
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>

Conflicts:
	- web_src/js/features/repo-diff-filetree.js
	  web_src/js/features/repo-diff.js
	  Conflicts resolved by manually applying the changes.
This commit is contained in:
a1012112796 2024-10-15 05:23:20 +08:00 • committed by Gergely Nagy
parent e8700cee61
commit 3aaf6f72d6
No known key found for this signature in database
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web_src/js/features/repo-diff-filetree.js
View file

@ -8,7 +8,9 @@ export function initDiffFileTree() {
const fileTreeView = createApp(DiffFileTree); const fileTreeView = createApp(DiffFileTree);
fileTreeView.mount(el); fileTreeView.mount(el);
}
export function initDiffFileList() {
const fileListElement = document.getElementById('diff-file-list'); const fileListElement = document.getElementById('diff-file-list');
if (!fileListElement) return; if (!fileListElement) return;

3
web_src/js/features/repo-diff.js
View file

@ -1,7 +1,7 @@
import $ from 'jquery'; import $ from 'jquery';
import {initCompReactionSelector} from './comp/ReactionSelector.js'; import {initCompReactionSelector} from './comp/ReactionSelector.js';
import {initRepoIssueContentHistory} from './repo-issue-content.js'; import {initRepoIssueContentHistory} from './repo-issue-content.js';
import {initDiffFileTree} from './repo-diff-filetree.js'; import {initDiffFileTree, initDiffFileList} from './repo-diff-filetree.js';
import {initDiffCommitSelect} from './repo-diff-commitselect.js'; import {initDiffCommitSelect} from './repo-diff-commitselect.js';
import {validateTextareaNonEmpty} from './comp/ComboMarkdownEditor.js'; import {validateTextareaNonEmpty} from './comp/ComboMarkdownEditor.js';
import {initViewedCheckboxListenerFor, countAndUpdateViewedFiles, initExpandAndCollapseFilesButton} from './pull-view-file.js'; import {initViewedCheckboxListenerFor, countAndUpdateViewedFiles, initExpandAndCollapseFilesButton} from './pull-view-file.js';
@ -223,6 +223,7 @@ export function initRepoDiffView() {
initRepoDiffConversationForm(); initRepoDiffConversationForm();
if (!$('#diff-file-list').length) return; if (!$('#diff-file-list').length) return;
initDiffFileTree(); initDiffFileTree();
initDiffFileList();
initDiffCommitSelect(); initDiffCommitSelect();
initRepoDiffShowMore(); initRepoDiffShowMore();
initRepoDiffReviewButton(); initRepoDiffReviewButton();