Merge branch 'ui-revamp' of https://github.com/intersystems/git-source-control into ui-revamp

isc-tleavitt · isc-tleavitt · commit 7af63991a587 · 2024-07-08T08:29:12.000-04:00
diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2423,17 +2423,17 @@ webui.NewChangedFilesView = function(workspaceView) {
     }
 
     self.unhighlightPrevious = function(){
-        $('[data-filename="' + fileToDiff + '"]').removeClass("diffed-file");
+        $('[data-filename="' + self.fileToDiff + '"]').removeClass("diffed-file");
     }
 
     self.refreshDiff = function(element) {
-        var fileToDiff = $(element).attr("data-filename");
+        self.fileToDiff = $(element).attr("data-filename");
         var indexStatus = $(element).attr("data-index-status");
         var gitOpts = [];
         if (indexStatus != " ") {
             gitOpts.push("--cached");
         }
-        workspaceView.diffView.update("diff", gitOpts, fileToDiff, "stage");
+        workspaceView.diffView.update("diff", gitOpts, self.fileToDiff, "stage");
     };
 
     self.stash = function() {
diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -2423,17 +2423,17 @@ webui.NewChangedFilesView = function(workspaceView) {
     }
 
     self.unhighlightPrevious = function(){
-        $('[data-filename="' + fileToDiff + '"]').removeClass("diffed-file");
+        $('[data-filename="' + self.fileToDiff + '"]').removeClass("diffed-file");
     }
 
     self.refreshDiff = function(element) {
-        var fileToDiff = $(element).attr("data-filename");
+        self.fileToDiff = $(element).attr("data-filename");
         var indexStatus = $(element).attr("data-index-status");
         var gitOpts = [];
         if (indexStatus != " ") {
             gitOpts.push("--cached");
         }
-        workspaceView.diffView.update("diff", gitOpts, fileToDiff, "stage");
+        workspaceView.diffView.update("diff", gitOpts, self.fileToDiff, "stage");
     };
 
     self.stash = function() {

Original file line number	Diff line number	Diff line change
`@@ -2423,17 +2423,17 @@ webui.NewChangedFilesView = function(workspaceView) {`
`2423`	`2423`	`}`
`2424`	`2424`
`2425`	`2425`	`self.unhighlightPrevious = function(){`
`2426`		`- $('[data-filename="' + fileToDiff + '"]').removeClass("diffed-file");`
	`2426`	`+ $('[data-filename="' + self.fileToDiff + '"]').removeClass("diffed-file");`
`2427`	`2427`	`}`
`2428`	`2428`
`2429`	`2429`	`self.refreshDiff = function(element) {`
`2430`		`- var fileToDiff = $(element).attr("data-filename");`
	`2430`	`+ self.fileToDiff = $(element).attr("data-filename");`
`2431`	`2431`	`var indexStatus = $(element).attr("data-index-status");`
`2432`	`2432`	`var gitOpts = [];`
`2433`	`2433`	`if (indexStatus != " ") {`
`2434`	`2434`	`gitOpts.push("--cached");`
`2435`	`2435`	`}`
`2436`		`- workspaceView.diffView.update("diff", gitOpts, fileToDiff, "stage");`
	`2436`	`+ workspaceView.diffView.update("diff", gitOpts, self.fileToDiff, "stage");`
`2437`	`2437`	`};`
`2438`	`2438`
`2439`	`2439`	`self.stash = function() {`