Skip to content

Responsive stash #736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 8, 2025
Merged

Responsive stash #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d24de70
Responsive stash
isc-etamarch Apr 8, 2025
edad912
Merge branch 'main' into issue-687
isc-etamarch Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Partial support for production decomposition with the new interoperability editors

### Fixed
- Popping from stash is more responsive (#687)
- Favorites links for Git pages now works on recent IRIS versions (#734)

## [2.10.0] - 2025-02-10
Expand Down
18 changes: 9 additions & 9 deletions git-webui/release/share/git-webui/webui/js/git-webui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2005,10 +2005,10 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
}
var stashIndex = parseInt($(".log-entry.active .stash-list-index").text());
webui.git_command(["stash", "apply", "stash@{"+stashIndex+"}"], function(output) {
webui.showSuccess(output);
parent.stashView.update(0);
webui.showSuccess("Applied stash item");
parent.update();
self.clear()
});
}, webui.showWarning(output), webui.showError(output));
}

self.popSelectedStash = function() {
Expand All @@ -2017,10 +2017,10 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
}
var stashIndex = parseInt($(".log-entry.active .stash-list-index").text());
webui.git_command(["stash", "pop", "stash@{"+stashIndex+"}"], function(output) {
webui.showSuccess(output);
parent.stashView.update(0);
webui.showSuccess("Popped from stash");
parent.update();
self.clear()
});
}, webui.showWarning(output), webui.showError(output));
}

self.dropSelectedStash = function() {
Expand All @@ -2029,10 +2029,10 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
}
var stashIndex = parseInt($(".log-entry.active .stash-list-index").text());
webui.git_command(["stash", "drop", "stash@{"+stashIndex+"}"], function() {
webui.showSuccess(output.substring(output.indexOf("Dropped")));
parent.stashView.update(0);
webui.showSuccess("Dropped from stash");
parent.update();
self.clear();
});
}, webui.showWarning(output), webui.showError(output));
}

var html = '<div class="diff-view-container panel panel-default">';
Expand Down
18 changes: 9 additions & 9 deletions git-webui/src/share/git-webui/webui/js/git-webui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2005,10 +2005,10 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
}
var stashIndex = parseInt($(".log-entry.active .stash-list-index").text());
webui.git_command(["stash", "apply", "stash@{"+stashIndex+"}"], function(output) {
webui.showSuccess(output);
parent.stashView.update(0);
webui.showSuccess("Applied stash item");
parent.update();
self.clear()
});
}, webui.showWarning(output), webui.showError(output));
}

self.popSelectedStash = function() {
Expand All @@ -2017,10 +2017,10 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
}
var stashIndex = parseInt($(".log-entry.active .stash-list-index").text());
webui.git_command(["stash", "pop", "stash@{"+stashIndex+"}"], function(output) {
webui.showSuccess(output);
parent.stashView.update(0);
webui.showSuccess("Popped from stash");
parent.update();
self.clear()
});
}, webui.showWarning(output), webui.showError(output));
}

self.dropSelectedStash = function() {
Expand All @@ -2029,10 +2029,10 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
}
var stashIndex = parseInt($(".log-entry.active .stash-list-index").text());
webui.git_command(["stash", "drop", "stash@{"+stashIndex+"}"], function() {
webui.showSuccess(output.substring(output.indexOf("Dropped")));
parent.stashView.update(0);
webui.showSuccess("Dropped from stash");
parent.update();
self.clear();
});
}, webui.showWarning(output), webui.showError(output));
}

var html = '<div class="diff-view-container panel panel-default">';
Expand Down
Loading