Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 23:15:43 +01:00
Code Issues Packages Projects Releases Activity

Give two options for diff expansion (some or all lines)

Browse Source
This commit is contained in:
René Pfeuffer
2020-05-30 16:35:49 +02:00
parent e7f03378a4
commit 8c1d463e09
4 changed files with 68 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scm-ui/ui-components/src/repos/DiffExpander.ts
View File

@@ -66,9 +66,9 @@ class DiffExpander {
return this.minLineNumber(n + 1) - this.maxLineNumber(n) - 1;
};
expandHead = (n: number, callback: (newFile: File) => void) => {
expandHead = (n: number, count: number, callback: (newFile: File) => void) => {
const lineRequestUrl = this.file._links.lines.href
.replace("{start}", this.minLineNumber(n) - Math.min(10, this.computeMaxExpandHeadRange(n)) - 1)
.replace("{start}", this.minLineNumber(n) - Math.min(count, this.computeMaxExpandHeadRange(n)) - 1)
.replace("{end}", this.minLineNumber(n) - 1);
apiClient
.get(lineRequestUrl)
@@ -77,10 +77,10 @@ class DiffExpander {
.then(lines => this.expandHunkAtHead(n, lines, callback));
};
expandBottom = (n: number, callback: (newFile: File) => void) => {
expandBottom = (n: number, count: number, callback: (newFile: File) => void) => {
const lineRequestUrl = this.file._links.lines.href
.replace("{start}", this.maxLineNumber(n))
.replace("{end}", this.maxLineNumber(n) + Math.min(10, this.computeMaxExpandBottomRange(n)));
.replace("{end}", this.maxLineNumber(n) + Math.min(count, this.computeMaxExpandBottomRange(n)));
apiClient
.get(lineRequestUrl)
.then(response => response.text())
@@ -173,8 +173,8 @@ class DiffExpander {
return {
maxExpandHeadRange: this.computeMaxExpandHeadRange(n),
maxExpandBottomRange: this.computeMaxExpandBottomRange(n),
expandHead: (callback: (newFile: File) => void) => this.expandHead(n, callback),
expandBottom: (callback: (newFile: File) => void) => this.expandBottom(n, callback),
expandHead: (count: number, callback: (newFile: File) => void) => this.expandHead(n, count, callback),
expandBottom: (count: number, callback: (newFile: File) => void) => this.expandBottom(n, count, callback),
hunk: this.file?.hunks![n]
};
};
@@ -184,8 +184,8 @@ export type ExpandableHunk = {
hunk: Hunk;
maxExpandHeadRange: number;
maxExpandBottomRange: number;
expandHead: (callback: (newFile: File) => void) => void;
expandBottom: (callback: (newFile: File) => void) => void;
expandHead: (count: number, callback: (newFile: File) => void) => void;
expandBottom: (count: number, callback: (newFile: File) => void) => void;
};
export default DiffExpander;