diff --git a/editor/js/ui/projects/tab-versionControl.js b/editor/js/ui/projects/tab-versionControl.js index 2d202a3a6..b9d09be56 100644 --- a/editor/js/ui/projects/tab-versionControl.js +++ b/editor/js/ui/projects/tab-versionControl.js @@ -116,6 +116,18 @@ RED.sidebar.versionControl = (function() { if (entry.label) { row.addClass('node-info-none'); container.text(entry.label); + if (entry.button) { + container.css({ + display: "inline-block", + maxWidth: "300px", + textAlign: "left" + }) + var toolbar = $('
').appendTo(container); + + $('').text(entry.button.label) + .appendTo(toolbar) + .click(entry.button.click); + } return; } @@ -370,17 +382,17 @@ RED.sidebar.versionControl = (function() { addButton: false, scrollOnAdd: false, addItem: function(row,index,entry) { - createChangeEntry(row,entry,entry.treeStatus,'unmerged'); if (entry === emptyMergedItem) { - var toolbar = $('
').appendTo(row); - $('') - .appendTo(toolbar) - .click(function(evt) { + entry.button = { + label: 'commit', + click: function(evt) { evt.preventDefault(); evt.stopPropagation(); showCommitBox(); - }); + } + } } + createChangeEntry(row,entry,entry.treeStatus,'unmerged'); }, sort: function(A,B) { if (A.treeStatus === '?' && B.treeStatus !== '?') { @@ -453,7 +465,7 @@ RED.sidebar.versionControl = (function() { commitBox = $('').hide().appendTo(localChanges.content); - var commitMessage = $('') .appendTo(commitBox) .on("change keyup paste",function() { submitCommitButton.attr('disabled',$(this).val().trim()==="");