Skip to content

Commit

Permalink
fix push button not appearing
Browse files Browse the repository at this point in the history
  • Loading branch information
isc-etamarch committed Nov 25, 2024
1 parent a0afa8b commit 31c183a
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Fixed
- Fixed minor issues in Studio UI (#641)
- Fixed push button not appearing after commit (#654)

## [2.7.1] - 2024-11-13

Expand Down
13 changes: 10 additions & 3 deletions git-webui/release/share/git-webui/webui/js/git-webui.js
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
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

0 comments on commit 31c183a

Please sign in to comment.