Skip to content
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

Jump to bottom

Expand selected file when clicking file tree #24041

Merged
merged 12 commits into from
Apr 12, 2023
Merged

Expand selected file when clicking file tree #24041

Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
77c5e93
expand selected file click in tree
sillyguodong Apr 11, 2023
12e5318
back
sillyguodong Apr 11, 2023
7445d5a
lint
sillyguodong Apr 11, 2023
e231c2d
expand when mounted
sillyguodong Apr 11, 2023
942d88e
assuming the attribute holds 'true' and 'false'
sillyguodong Apr 11, 2023
446258b
Update web_src/js/components/DiffFileTree.vue
silverwind Apr 11, 2023
cf154af
Merge branch 'main' into feature/expand_selected_file_click_tree
sillyguodong Apr 12, 2023
25e8cbb
fix
sillyguodong Apr 12, 2023
b821dae
Merge branch 'main' into feature/expand_selected_file_click_tree
GiteaBot Apr 12, 2023
e925f0d
prevent box not exists
sillyguodong Apr 12, 2023
26267a5
Merge branch 'feature/expand_selected_file_click_tree' of github.com:…
sillyguodong Apr 12, 2023
0340dc2
Merge branch 'main' into feature/expand_selected_file_click_tree
GiteaBot Apr 12, 2023
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
9 changes: 9 additions & 0 deletions web_src/js/components/DiffFileTree.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import DiffFileTreeItem from './DiffFileTreeItem.vue';
import {doLoadMoreFiles} from '../features/repo-diff.js';
import {toggleElem} from '../utils/dom.js';
import {DiffTreeStore} from '../modules/stores.js';
import {setFileFolding} from '../features/file-fold.js';

const {pageData} = window.config;
const LOCAL_STORAGE_KEY = 'diff_file_tree_visible';
Expand Down Expand Up @@ -104,6 +105,7 @@ export default {

this.hashChangeListener = () => {
this.store.selectedItem = window.location.hash;
this.expandSelectedFile();
};
this.hashChangeListener();
window.addEventListener('hashchange', this.hashChangeListener);
Expand All @@ -113,6 +115,13 @@ export default {
window.removeEventListener('hashchange', this.hashChangeListener);
},
methods: {
expandSelectedFile() {
// expand file if the selected file is folded
if (this.store.selectedItem) {
const box = document.querySelector(this.store.selectedItem);
setFileFolding(box, box.querySelector('.fold-file'), false);
Copy link
Contributor

@wxiaoguang wxiaoguang Apr 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does box always exist? For example, if a user clicks an old URL with old query hash, then there is no related box on UI, will it cause JS error?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

const folded = box?.getAttribute('data-folded') === 'true';
if (folded) setFileFolding(box, box.querySelector('.fold-file'), false);

maybe use ? to prevent box not exists
and use getAttribute('data-folded') to check whether the box is folded?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, sorry. Forgot this.

}
},
toggleVisibility() {
this.updateVisibility(!this.fileTreeIsVisible);
},
Expand Down