Skip to content
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

fix push button not appearing #661

Merged
merged 5 commits into from
Dec 18, 2024
Merged

fix push button not appearing #661

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31c183a
fix push button not appearing
isc-etamarch Nov 25, 2024
42a5bb6
Merge branch 'main' into 654-push-option-doesnt-appear-on-local-branc…
isc-etamarch Dec 5, 2024
435b7e0
Merge branch 'main' into 654-push-option-doesnt-appear-on-local-branc…
isc-etamarch Dec 9, 2024
416fb96
Fixed Changelog
isc-etamarch Dec 9, 2024
a9e9b56
Merge branch 'main' into 654-push-option-doesnt-appear-on-local-branc…
isc-tleavitt Dec 18, 2024
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [2.8.1] - Unreleased

### Fixed
- Fixed push button not appearing after commit (#654)

## [2.8.0] - 2024-12-06

### Added
Expand Down
13 changes: 10 additions & 3 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 @@ -975,6 +975,12 @@ webui.SideBarView = function(mainView, noEventHandlers) {
});
};

self.refreshSideBar = function() {
self.fetchSection($("#sidebar-local-branches", self.element)[0], "Local Branches", "local-branches", "branch --verbose --verbose");
self.fetchSection($("#sidebar-remote-branches", self.element)[0], "Remote Branches", "remote-branches", "branch --remotes");
self.fetchSection($("#sidebar-tags", self.element)[0], "Tags", "tags", "tag");
}

self.mainView = mainView;
self.currentContext = self.getCurrentContext();
self.element = $( '<div id="sidebar">' +
Expand Down Expand Up @@ -1059,12 +1065,11 @@ webui.SideBarView = function(mainView, noEventHandlers) {
if ((window !== window.parent) || (navigator.userAgent.indexOf('MSIE 7') > -1) || (navigator.userAgent.indexOf(" Code/") > -1)) {
$("#sidebar-home", self.element).remove();
}


self.getPackageVersion();
self.getEnvironment()
self.fetchSection($("#sidebar-local-branches", self.element)[0], "Local Branches", "local-branches", "branch --verbose --verbose");
self.fetchSection($("#sidebar-remote-branches", self.element)[0], "Remote Branches", "remote-branches", "branch --remotes");
self.fetchSection($("#sidebar-tags", self.element)[0], "Tags", "tags", "tag");
self.refreshSideBar();

if(!noEventHandlers){
$(document).on('click', '.btn-checkout-local-branch', self.checkoutLocalBranch);
Expand Down Expand Up @@ -2620,6 +2625,8 @@ webui.NewChangedFilesView = function(workspaceView) {
} else {
var commitMessage = $('#commitMsg').val();
self.commit(commitMessage, $("#commitMsgDetail").val());
setTimeout(updateSideBar, 2000);
;
}
}
})
Expand Down
13 changes: 10 additions & 3 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 @@ -975,6 +975,12 @@ webui.SideBarView = function(mainView, noEventHandlers) {
});
};

self.refreshSideBar = function() {
self.fetchSection($("#sidebar-local-branches", self.element)[0], "Local Branches", "local-branches", "branch --verbose --verbose");
self.fetchSection($("#sidebar-remote-branches", self.element)[0], "Remote Branches", "remote-branches", "branch --remotes");
self.fetchSection($("#sidebar-tags", self.element)[0], "Tags", "tags", "tag");
}

self.mainView = mainView;
self.currentContext = self.getCurrentContext();
self.element = $( '<div id="sidebar">' +
Expand Down Expand Up @@ -1059,12 +1065,11 @@ webui.SideBarView = function(mainView, noEventHandlers) {
if ((window !== window.parent) || (navigator.userAgent.indexOf('MSIE 7') > -1) || (navigator.userAgent.indexOf(" Code/") > -1)) {
$("#sidebar-home", self.element).remove();
}


self.getPackageVersion();
self.getEnvironment()
self.fetchSection($("#sidebar-local-branches", self.element)[0], "Local Branches", "local-branches", "branch --verbose --verbose");
self.fetchSection($("#sidebar-remote-branches", self.element)[0], "Remote Branches", "remote-branches", "branch --remotes");
self.fetchSection($("#sidebar-tags", self.element)[0], "Tags", "tags", "tag");
self.refreshSideBar();

if(!noEventHandlers){
$(document).on('click', '.btn-checkout-local-branch', self.checkoutLocalBranch);
Expand Down Expand Up @@ -2620,6 +2625,8 @@ webui.NewChangedFilesView = function(workspaceView) {
} else {
var commitMessage = $('#commitMsg').val();
self.commit(commitMessage, $("#commitMsgDetail").val());
setTimeout(updateSideBar, 2000);
;
}
}
})
Expand Down
Loading