Merge pull request #608 from intersystems/issue-590

Fix diffview

Author: isc-tleavitt

CHANGELOG.md

@@ -51,6 +51,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed changing favorites for users without permissions (#587)
 - Fix creating new branch from Git Web UI (#591)
 - Fix wording for Git Repo Root Directory (#601)
+- Fix Diff View options not applying immediately (#590)
 
 ## [2.6.0] - 2024-10-07
 

git-webui/release/share/git-webui/webui/js/git-webui.js

@@ -1525,6 +1525,13 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
     var self = this;
 
     self.update = function(cmd, diffOpts, file, mode) {
+        if (cmd || diffOpts || file || mode) {
+            // if new input, update all
+            this.cmd = cmd
+            this.diffOpts = diffOpts
+            this.file = file
+            this.mode = mode
+        }
         gitApplyType = mode;
         $(".diff-stage", self.element).attr("style", "display:none");
         $(".diff-cancel", self.element).attr("style", "display:none");
@@ -1576,6 +1583,10 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
         }
     };
 
+    self.reRun = function() {
+        self.update(this.cmd, this.diffOpts, this.file, this.mode)
+    }
+
     self.refresh = function(diff) {
         self.currentDiff = diff;
         self.diffHeader = "";
@@ -1789,24 +1800,24 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
 
     self.addContext = function() {
         self.context += 3;
-        self.update();
+        self.reRun();
     }
 
     self.removeContext = function() {
         if (self.context > 3) {
             self.context -= 3;
-            self.update();
+            self.reRun();
         }
     }
 
     self.allContext = function() {
         self.complete = !self.complete;
-        self.update();
+        self.reRun();
     }
 
     self.toggleIgnoreWhitespace = function() {
         self.ignoreWhitespace = !self.ignoreWhitespace;
-        self.update();
+        self.reRun();
     }
 
     self.handleClick = function(event) {

git-webui/src/share/git-webui/webui/js/git-webui.js

@@ -1525,6 +1525,13 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
     var self = this;
 
     self.update = function(cmd, diffOpts, file, mode) {
+        if (cmd || diffOpts || file || mode) {
+            // if new input, update all
+            this.cmd = cmd
+            this.diffOpts = diffOpts
+            this.file = file
+            this.mode = mode
+        }
         gitApplyType = mode;
         $(".diff-stage", self.element).attr("style", "display:none");
         $(".diff-cancel", self.element).attr("style", "display:none");
@@ -1576,6 +1583,10 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
         }
     };
 
+    self.reRun = function() {
+        self.update(this.cmd, this.diffOpts, this.file, this.mode)
+    }
+
     self.refresh = function(diff) {
         self.currentDiff = diff;
         self.diffHeader = "";
@@ -1789,24 +1800,24 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
 
     self.addContext = function() {
         self.context += 3;
-        self.update();
+        self.reRun();
     }
 
     self.removeContext = function() {
         if (self.context > 3) {
             self.context -= 3;
-            self.update();
+            self.reRun();
         }
     }
 
     self.allContext = function() {
         self.complete = !self.complete;
-        self.update();
+        self.reRun();
     }
 
     self.toggleIgnoreWhitespace = function() {
         self.ignoreWhitespace = !self.ignoreWhitespace;
-        self.update();
+        self.reRun();
     }
 
     self.handleClick = function(event) {