Skip to content

Commit 11e80f5

Browse files
committed
mhutchie#420 Fixed an issue that prevented files that overflow horizontally in the Commit Details View Files View from being left-clicked. This issue was introduced with mhutchie#381.
1 parent 90467a2 commit 11e80f5

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

web/main.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2692,7 +2692,7 @@ class GitGraphView {
26922692
triggerOpenFile(getFileOfFileElem(expandedCommit.fileChanges, fileElem), fileElem);
26932693
});
26942694

2695-
addListenerToClass('fileTreeFileDetails', 'contextmenu', (e: Event) => {
2695+
addListenerToClass('fileTreeFileRecord', 'contextmenu', (e: Event) => {
26962696
handledEvent(e);
26972697
const expandedCommit = this.expandedCommit;
26982698
if (expandedCommit === null || expandedCommit.fileChanges === null || e.target === null) return;
@@ -3130,10 +3130,9 @@ function generateFileTreeLeafHtml(name: string, leaf: FileTreeLeaf, gitFiles: Re
31303130
const textFile = fileTreeFile.additions !== null && fileTreeFile.deletions !== null;
31313131
const diffPossible = fileTreeFile.type === GG.GitFileStatus.Untracked || textFile;
31323132
const changeTypeMessage = GIT_FILE_CHANGE_TYPES[fileTreeFile.type] + (fileTreeFile.type === GG.GitFileStatus.Renamed ? ' (' + escapeHtml(fileTreeFile.oldFilePath) + ' → ' + escapeHtml(fileTreeFile.newFilePath) + ')' : '');
3133-
return '<li data-pathseg="' + encodedName + '"><span class="fileTreeFileRecord' + (leaf.index === fileContextMenuOpen ? ' ' + CLASS_CONTEXT_MENU_ACTIVE : '') + '" data-index="' + leaf.index + '"><span class="fileTreeFileDetails"><span class="fileTreeFile' + (diffPossible ? ' gitDiffPossible' : '') + (leaf.reviewed ? '' : ' pendingReview') + '" title="' + (diffPossible ? 'Click to View Diff' : 'Unable to View Diff' + (fileTreeFile.type !== GG.GitFileStatus.Deleted ? ' (this is a binary file)' : '')) + ' • ' + changeTypeMessage + '"><span class="fileTreeFileIcon">' + SVG_ICONS.file + '</span><span class="gitFileName ' + fileTreeFile.type + '">' + escapedName + '</span></span>' +
3133+
return '<li data-pathseg="' + encodedName + '"><span class="fileTreeFileRecord' + (leaf.index === fileContextMenuOpen ? ' ' + CLASS_CONTEXT_MENU_ACTIVE : '') + '" data-index="' + leaf.index + '"><span class="fileTreeFile' + (diffPossible ? ' gitDiffPossible' : '') + (leaf.reviewed ? '' : ' ' + CLASS_PENDING_REVIEW) + '" title="' + (diffPossible ? 'Click to View Diff' : 'Unable to View Diff' + (fileTreeFile.type !== GG.GitFileStatus.Deleted ? ' (this is a binary file)' : '')) + ' • ' + changeTypeMessage + '"><span class="fileTreeFileIcon">' + SVG_ICONS.file + '</span><span class="gitFileName ' + fileTreeFile.type + '">' + escapedName + '</span></span>' +
31343134
(initialState.config.enhancedAccessibility ? '<span class="fileTreeFileType" title="' + changeTypeMessage + '">' + fileTreeFile.type + '</span>' : '') +
31353135
(fileTreeFile.type !== GG.GitFileStatus.Added && fileTreeFile.type !== GG.GitFileStatus.Untracked && fileTreeFile.type !== GG.GitFileStatus.Deleted && textFile ? '<span class="fileTreeFileAddDel">(<span class="fileTreeFileAdd" title="' + fileTreeFile.additions + ' addition' + (fileTreeFile.additions !== 1 ? 's' : '') + '">+' + fileTreeFile.additions + '</span>|<span class="fileTreeFileDel" title="' + fileTreeFile.deletions + ' deletion' + (fileTreeFile.deletions !== 1 ? 's' : '') + '">-' + fileTreeFile.deletions + '</span>)</span>' : '') +
3136-
'</span>' +
31373136
(fileTreeFile.newFilePath === lastViewedFile ? '<span id="cdvLastFileViewed" title="Last File Viewed">' + SVG_ICONS.eyeOpen + '</span>' : '') +
31383137
'<span class="copyGitFile fileTreeFileAction" title="Copy File Path to the Clipboard">' + SVG_ICONS.copy + '</span>' +
31393138
(fileTreeFile.type !== GG.GitFileStatus.Deleted
@@ -3224,7 +3223,7 @@ function updateFileTreeHtml(elem: HTMLElement, folder: FileTreeFolder) {
32243223
alterClass(<HTMLSpanElement>li.children[0], CLASS_PENDING_REVIEW, !child.reviewed);
32253224
updateFileTreeHtml(li, child);
32263225
} else if (child.type === 'file') {
3227-
alterClass(<HTMLSpanElement>li.children[0].children[0].children[0], CLASS_PENDING_REVIEW, !child.reviewed);
3226+
alterClass(<HTMLSpanElement>li.children[0].children[0], CLASS_PENDING_REVIEW, !child.reviewed);
32283227
}
32293228
}
32303229
}
@@ -3245,7 +3244,7 @@ function updateFileTreeHtmlFileReviewed(elem: HTMLElement, folder: FileTreeFolde
32453244
path = path.substring(pathSeg.length + 1);
32463245
update(li, child);
32473246
} else if (child.type === 'file') {
3248-
alterClass(<HTMLSpanElement>li.children[0].children[0].children[0], CLASS_PENDING_REVIEW, !child.reviewed);
3247+
alterClass(<HTMLSpanElement>li.children[0].children[0], CLASS_PENDING_REVIEW, !child.reviewed);
32493248
}
32503249
break;
32513250
}

0 commit comments

Comments
 (0)