Skip to content

Commit b398d5d

Browse files
authored
Merge pull request #422 from intersystems/fix-stash-view-diff
WebUI stash list now shows diff for selected stash item
2 parents c8315c3 + 9b9c050 commit b398d5d

File tree

3 files changed

+1
-18
lines changed

3 files changed

+1
-18
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Fixed
1111
- Fixed JS errors in Studio on certain operations (#416)
12+
- Fixed issue where selecting different item in stash list didn't update diff view (#265)
1213
- Tooltip in workspace now shows user who made uncommitted change if not current user (#411)
1314
- Files are added to source control upon creation properly (#404)
1415
- Files show in uncommitted queue when automatically added (#407)

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,11 +1256,7 @@ webui.StashCommitView = function(stashView) {
12561256
var self = this;
12571257

12581258
self.update = function(entry) {
1259-
if (currentCommit == entry.commit) {
1260-
// We already display the right data. No need to update.
1261-
return;
12621259

1263-
}
12641260
currentCommit = entry.commit;
12651261
self.showDiff();
12661262
diffView.update("stash show -p stash@{"+entry.stashIndex+"}");
@@ -2060,11 +2056,6 @@ webui.CommitView = function(historyView) {
20602056
var self = this;
20612057

20622058
self.update = function(entry) {
2063-
if (currentCommit == entry.commit) {
2064-
// We already display the right data. No need to update.
2065-
return;
2066-
2067-
}
20682059
currentCommit = entry.commit;
20692060
self.showDiff();
20702061
buttonBox.select(0);

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,11 +1256,7 @@ webui.StashCommitView = function(stashView) {
12561256
var self = this;
12571257

12581258
self.update = function(entry) {
1259-
if (currentCommit == entry.commit) {
1260-
// We already display the right data. No need to update.
1261-
return;
12621259

1263-
}
12641260
currentCommit = entry.commit;
12651261
self.showDiff();
12661262
diffView.update("stash show -p stash@{"+entry.stashIndex+"}");
@@ -2060,11 +2056,6 @@ webui.CommitView = function(historyView) {
20602056
var self = this;
20612057

20622058
self.update = function(entry) {
2063-
if (currentCommit == entry.commit) {
2064-
// We already display the right data. No need to update.
2065-
return;
2066-
2067-
}
20682059
currentCommit = entry.commit;
20692060
self.showDiff();
20702061
buttonBox.select(0);

0 commit comments

Comments
 (0)