Skip to content

Commit 8ac7686

Browse files
authored
Merge pull request #51 from hansu/48-fix-cdvFileView
48 fix cdv file view
2 parents cb3773d + 3776570 commit 8ac7686

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

web/main.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2709,7 +2709,7 @@ class GitGraphView {
27092709
}
27102710
}, () => this.saveState());
27112711

2712-
observeElemScroll('cdvFiles', expandedCommit.scrollTop.fileView, (scrollTop) => {
2712+
observeElemScroll('cdvFilesView', expandedCommit.scrollTop.fileView, (scrollTop) => {
27132713
if (this.expandedCommit === null) return;
27142714
this.expandedCommit.scrollTop.fileView = scrollTop;
27152715
if (this.expandedCommit.contextMenuOpen.fileView > -1) {
@@ -2908,7 +2908,7 @@ class GitGraphView {
29082908
* @param fileWasViewed Was the file viewed - if so, set it to be the last viewed file.
29092909
*/
29102910
private cdvUpdateFileState(file: GG.GitFileChange, fileElem: HTMLElement, isReviewed: boolean | null, fileWasViewed: boolean) {
2911-
const expandedCommit = this.expandedCommit, filesElem = document.getElementById('cdvFiles'), filePath = file.newFilePath;
2911+
const expandedCommit = this.expandedCommit, filesElem = document.getElementById('cdvFilesView'), filePath = file.newFilePath;
29122912
if (expandedCommit === null || expandedCommit.fileTree === null || filesElem === null) return;
29132913

29142914
if (fileWasViewed) {
@@ -2979,7 +2979,7 @@ class GitGraphView {
29792979
}
29802980

29812981
private changeFileViewType(type: GG.FileViewType) {
2982-
const expandedCommit = this.expandedCommit, filesElem = document.getElementById('cdvFiles');
2982+
const expandedCommit = this.expandedCommit, filesElem = document.getElementById('cdvFilesView');
29832983
if (expandedCommit === null || expandedCommit.fileTree === null || expandedCommit.fileChanges === null || filesElem === null) return;
29842984
GitGraphView.closeCdvContextMenuIfOpen(expandedCommit);
29852985
this.setFileViewType(type);
@@ -3301,7 +3301,7 @@ class GitGraphView {
33013301
}
33023302

33033303
private saveAndRenderCodeReview(codeReview: GG.CodeReview | null) {
3304-
let filesElem = document.getElementById('cdvFiles');
3304+
let filesElem = document.getElementById('cdvFilesView');
33053305
if (this.expandedCommit === null || this.expandedCommit.fileTree === null || filesElem === null) return;
33063306

33073307
this.expandedCommit.codeReview = codeReview;

web/styles/main.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ table { border-collapse: collapse; }
500500
right: 0;
501501
top:0;
502502
bottom:0;
503-
z-index: 11;
503+
z-index: 1;
504504
pointer-events: none;
505505

506506
}

0 commit comments

Comments
 (0)