diff --git a/editor/js/main.js b/editor/js/main.js
index 4c061083a..a9afd5bc1 100644
--- a/editor/js/main.js
+++ b/editor/js/main.js
@@ -43,7 +43,9 @@
$(".palette-scroll").removeClass("hide");
$("#palette-search").removeClass("hide");
loadFlows(function() {
- RED.projects.refresh();
+ RED.projects.refresh(function() {
+ RED.sidebar.info.refresh()
+ });
var persistentNotifications = {};
RED.comms.subscribe("notification/#",function(topic,msg) {
diff --git a/editor/js/ui/common/stack.js b/editor/js/ui/common/stack.js
index 5b28eccd9..eca30bd75 100644
--- a/editor/js/ui/common/stack.js
+++ b/editor/js/ui/common/stack.js
@@ -101,6 +101,14 @@ RED.stack = (function() {
if (entry.onexpand) {
entry.onexpand.call(entry);
}
+ if (options.singleExpanded) {
+ entries.forEach(function(e) {
+ if (e !== entry) {
+ e.collapse();
+ }
+ })
+ }
+
icon.addClass("expanded");
entry.container.addClass("palette-category-expanded");
entry.contentWrap.slideDown(200);
diff --git a/editor/js/ui/diff.js b/editor/js/ui/diff.js
index 171db8637..8e9fdbbd3 100644
--- a/editor/js/ui/diff.js
+++ b/editor/js/ui/diff.js
@@ -1581,10 +1581,10 @@ RED.diff = (function() {
if (Adiff.type === 2) {
cellNo.addClass('blank');
cellLine.addClass('blank');
- } else if (Adiff.type === 1) {
+ } else if (Adiff.type === 4) {
cellNo.addClass('added');
cellLine.addClass('added');
- } else if (Adiff.type === 4) {
+ } else if (Adiff.type === 1) {
cellNo.addClass('removed');
cellLine.addClass('removed');
}
@@ -1593,10 +1593,10 @@ RED.diff = (function() {
if (Bdiff.type === 2) {
cellNo.addClass('blank');
cellLine.addClass('blank');
- } else if (Bdiff.type === 1) {
+ } else if (Bdiff.type === 4) {
cellNo.addClass('added');
cellLine.addClass('added');
- } else if (Bdiff.type === 4) {
+ } else if (Bdiff.type === 1) {
cellNo.addClass('removed');
cellLine.addClass('removed');
}
@@ -1694,9 +1694,14 @@ RED.diff = (function() {
var isCollapsed = diffFileRow.hasClass("collapsed");
diffFileRow.nextUntil(".node-text-diff-file-header").toggle(!isCollapsed);
})
- var label = $('').text(file.file).appendTo(content);
+ var label = $('').text(file.file).appendTo(content);
- if (commitOptions.project.files && commitOptions.project.files.flow === file.file) {
+ var conflictHeader;
+ var unresolvedConflicts = 0;
+ var resolvedConflicts = 0;
+ var conflictResolutions = {};
+
+ if (!commitOptions.unmerged && commitOptions.project.files && commitOptions.project.files.flow === file.file) {
var tools = $('').appendTo(content);
$('').appendTo(tools).click(function(e) {
e.preventDefault();
@@ -1740,47 +1745,143 @@ RED.diff = (function() {
}
- for (var i=0;i