frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Fix merge-abort button

Browse Source
This commit is contained in:
Nick O'Leary 2017-12-06 22:39:20 +00:00
parent 55cd069043
commit f86d3a69d2
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/js/ui/tab-versionControl.js
View File

@ -294,7 +294,7 @@ RED.sidebar.versionControl = (function() {
.click(function(evt) { .click(function(evt) {
evt.preventDefault(); evt.preventDefault();
evt.stopPropagation(); evt.stopPropagation();
var spinner =u(unmergedContent); var spinner = utils.addSpinnerOverlay(unmergedContent);
var activeProject = RED.projects.getActiveProject(); var activeProject = RED.projects.getActiveProject();
utils.sendRequest({ utils.sendRequest({
url: "projects/"+activeProject.name+"/merge", url: "projects/"+activeProject.name+"/merge",