").appendTo(nodePropertiesTableBody);
+ var propertyNameCell = $("| ",{class:"node-diff-property-cell-label"}).html(d).appendTo(row);
localCell = $(" | ",{class:"node-diff-property-cell node-diff-node-local"}).appendTo(row);
if (localNode) {
if (!conflict) {
@@ -1056,185 +1043,223 @@ RED.diff = (function() {
}
function showDiff(diff) {
+ if (diffVisible) {
+ return;
+ }
+
var localDiff = diff.localDiff;
var remoteDiff = diff.remoteDiff;
var conflicts = diff.conflicts;
currentDiff = diff;
- var list = $("#node-dialog-view-diff-diff");
- list.editableList('empty');
- if (remoteDiff) {
- $("#node-diff-view-diff-merge").show();
- if (Object.keys(conflicts).length === 0) {
- $("#node-diff-view-diff-merge").removeClass('disabled');
- } else {
- $("#node-diff-view-diff-merge").addClass('disabled');
- }
- } else {
- $("#node-diff-view-diff-merge").hide();
- }
- refreshConflictHeader();
-
- $("#node-dialog-view-diff-headers").empty();
- // console.log("--------------");
- // console.log(localDiff);
- // console.log(remoteDiff);
- var currentConfig = localDiff.currentConfig;
- var newConfig = localDiff.newConfig;
- conflicts = conflicts || {};
-
- var el = {
- diff: localDiff,
- def: {
- category: 'config',
- color: '#f0f0f0'
+ var trayOptions = {
+ title: "Review Changes", //TODO: nls
+ width: Infinity,
+ buttons: [
+ {
+ text: RED._("common.label.cancel"),
+ click: function() {
+ RED.tray.close();
+ }
+ },
+ {
+ id: "node-diff-view-diff-merge",
+ text: RED._("deploy.confirm.button.merge"),
+ class: "primary disabled",
+ click: function() {
+ if (!$("#node-diff-view-diff-merge").hasClass('disabled')) {
+ refreshConflictHeader();
+ mergeDiff(currentDiff);
+ RED.tray.close();
+ }
+ }
+ }
+ ],
+ resize: function(dimensions) {
+ // trayWidth = dimensions.width;
},
- tab: {
- n: {},
- nodes: currentConfig.globals
- },
- newTab: {
- n: {},
- nodes: newConfig.globals
- }
- };
+ open: function(tray) {
+ var trayBody = tray.find('.editor-tray-body');
+ var diffPanel = buildDiffPanel().appendTo(trayBody);
+ if (remoteDiff) {
+ $("#node-diff-view-diff-merge").show();
+ if (Object.keys(conflicts).length === 0) {
+ $("#node-diff-view-diff-merge").removeClass('disabled');
+ } else {
+ $("#node-diff-view-diff-merge").addClass('disabled');
+ }
+ } else {
+ $("#node-diff-view-diff-merge").hide();
+ }
+ refreshConflictHeader();
- if (remoteDiff !== undefined) {
- $('#node-dialog-view-diff').addClass('node-diff-three-way');
+ $("#node-dialog-view-diff-headers").empty();
+ // console.log("--------------");
+ // console.log(localDiff);
+ // console.log(remoteDiff);
+ var currentConfig = localDiff.currentConfig;
+ var newConfig = localDiff.newConfig;
+ conflicts = conflicts || {};
- $('').i18n().appendTo("#node-dialog-view-diff-headers");
- el.remoteTab = {
- n:{},
- nodes:remoteDiff.newConfig.globals
- };
- el.remoteDiff = remoteDiff;
- } else {
- $('#node-dialog-view-diff').removeClass('node-diff-three-way');
- }
-
- list.editableList('addItem',el);
-
- var seenTabs = {};
-
- currentConfig.tabOrder.forEach(function(tabId) {
- var tab = currentConfig.tabs[tabId];
- var el = {
- diff: localDiff,
- def: RED.nodes.getType('tab'),
- tab:tab
- };
- if (newConfig.tabs.hasOwnProperty(tabId)) {
- el.newTab = newConfig.tabs[tabId];
- }
- if (remoteDiff !== undefined) {
- el.remoteTab = remoteDiff.newConfig.tabs[tabId];
- el.remoteDiff = remoteDiff;
- }
- seenTabs[tabId] = true;
- list.editableList('addItem',el)
- });
- newConfig.tabOrder.forEach(function(tabId) {
- if (!seenTabs[tabId]) {
- seenTabs[tabId] = true;
- var tab = newConfig.tabs[tabId];
var el = {
diff: localDiff,
- def: RED.nodes.getType('tab'),
- tab:tab,
- newTab: tab
+ def: {
+ category: 'config',
+ color: '#f0f0f0'
+ },
+ tab: {
+ n: {},
+ nodes: currentConfig.globals
+ },
+ newTab: {
+ n: {},
+ nodes: newConfig.globals
+ }
};
+
if (remoteDiff !== undefined) {
+ diffPanel.addClass('node-diff-three-way');
+
+ $('').i18n().appendTo("#node-dialog-view-diff-headers");
+ el.remoteTab = {
+ n:{},
+ nodes:remoteDiff.newConfig.globals
+ };
el.remoteDiff = remoteDiff;
+ } else {
+ diffPanel.removeClass('node-diff-three-way');
}
- list.editableList('addItem',el)
- }
- });
- if (remoteDiff !== undefined) {
- remoteDiff.newConfig.tabOrder.forEach(function(tabId) {
- if (!seenTabs[tabId]) {
- var tab = remoteDiff.newConfig.tabs[tabId];
- // TODO how to recognise this is a remotely added flow
+
+ diffList.editableList('addItem',el);
+
+ var seenTabs = {};
+
+ currentConfig.tabOrder.forEach(function(tabId) {
+ var tab = currentConfig.tabs[tabId];
var el = {
diff: localDiff,
- remoteDiff: remoteDiff,
def: RED.nodes.getType('tab'),
- tab:tab,
- remoteTab:tab
+ tab:tab
};
- list.editableList('addItem',el)
- }
- });
- }
- var subflowId;
- for (subflowId in currentConfig.subflows) {
- if (currentConfig.subflows.hasOwnProperty(subflowId)) {
- seenTabs[subflowId] = true;
- el = {
- diff: localDiff,
- def: {
- defaults:{},
- icon:"subflow.png",
- category: "subflows",
- color: "#da9"
- },
- tab:currentConfig.subflows[subflowId]
- }
- if (newConfig.subflows.hasOwnProperty(subflowId)) {
- el.newTab = newConfig.subflows[subflowId];
- }
- if (remoteDiff !== undefined) {
- el.remoteTab = remoteDiff.newConfig.subflows[subflowId];
- el.remoteDiff = remoteDiff;
- }
- list.editableList('addItem',el)
- }
- }
- for (subflowId in newConfig.subflows) {
- if (newConfig.subflows.hasOwnProperty(subflowId) && !seenTabs[subflowId]) {
- seenTabs[subflowId] = true;
- el = {
- diff: localDiff,
- def: {
- defaults:{},
- icon:"subflow.png",
- category: "subflows",
- color: "#da9"
- },
- tab:newConfig.subflows[subflowId],
- newTab:newConfig.subflows[subflowId]
- }
- if (remoteDiff !== undefined) {
- el.remoteDiff = remoteDiff;
- }
- list.editableList('addItem',el)
- }
- }
- if (remoteDiff !== undefined) {
- for (subflowId in remoteDiff.newConfig.subflows) {
- if (remoteDiff.newConfig.subflows.hasOwnProperty(subflowId) && !seenTabs[subflowId]) {
- el = {
- diff: localDiff,
- remoteDiff: remoteDiff,
- def: {
- defaults:{},
- icon:"subflow.png",
- category: "subflows",
- color: "#da9"
- },
- tab:remoteDiff.newConfig.subflows[subflowId],
- remoteTab: remoteDiff.newConfig.subflows[subflowId]
+ if (newConfig.tabs.hasOwnProperty(tabId)) {
+ el.newTab = newConfig.tabs[tabId];
}
- list.editableList('addItem',el)
+ if (remoteDiff !== undefined) {
+ el.remoteTab = remoteDiff.newConfig.tabs[tabId];
+ el.remoteDiff = remoteDiff;
+ }
+ seenTabs[tabId] = true;
+ diffList.editableList('addItem',el)
+ });
+ newConfig.tabOrder.forEach(function(tabId) {
+ if (!seenTabs[tabId]) {
+ seenTabs[tabId] = true;
+ var tab = newConfig.tabs[tabId];
+ var el = {
+ diff: localDiff,
+ def: RED.nodes.getType('tab'),
+ tab:tab,
+ newTab: tab
+ };
+ if (remoteDiff !== undefined) {
+ el.remoteDiff = remoteDiff;
+ }
+ diffList.editableList('addItem',el)
+ }
+ });
+ if (remoteDiff !== undefined) {
+ remoteDiff.newConfig.tabOrder.forEach(function(tabId) {
+ if (!seenTabs[tabId]) {
+ var tab = remoteDiff.newConfig.tabs[tabId];
+ // TODO how to recognise this is a remotely added flow
+ var el = {
+ diff: localDiff,
+ remoteDiff: remoteDiff,
+ def: RED.nodes.getType('tab'),
+ tab:tab,
+ remoteTab:tab
+ };
+ diffList.editableList('addItem',el)
+ }
+ });
}
+ var subflowId;
+ for (subflowId in currentConfig.subflows) {
+ if (currentConfig.subflows.hasOwnProperty(subflowId)) {
+ seenTabs[subflowId] = true;
+ el = {
+ diff: localDiff,
+ def: {
+ defaults:{},
+ icon:"subflow.png",
+ category: "subflows",
+ color: "#da9"
+ },
+ tab:currentConfig.subflows[subflowId]
+ }
+ if (newConfig.subflows.hasOwnProperty(subflowId)) {
+ el.newTab = newConfig.subflows[subflowId];
+ }
+ if (remoteDiff !== undefined) {
+ el.remoteTab = remoteDiff.newConfig.subflows[subflowId];
+ el.remoteDiff = remoteDiff;
+ }
+ diffList.editableList('addItem',el)
+ }
+ }
+ for (subflowId in newConfig.subflows) {
+ if (newConfig.subflows.hasOwnProperty(subflowId) && !seenTabs[subflowId]) {
+ seenTabs[subflowId] = true;
+ el = {
+ diff: localDiff,
+ def: {
+ defaults:{},
+ icon:"subflow.png",
+ category: "subflows",
+ color: "#da9"
+ },
+ tab:newConfig.subflows[subflowId],
+ newTab:newConfig.subflows[subflowId]
+ }
+ if (remoteDiff !== undefined) {
+ el.remoteDiff = remoteDiff;
+ }
+ diffList.editableList('addItem',el)
+ }
+ }
+ if (remoteDiff !== undefined) {
+ for (subflowId in remoteDiff.newConfig.subflows) {
+ if (remoteDiff.newConfig.subflows.hasOwnProperty(subflowId) && !seenTabs[subflowId]) {
+ el = {
+ diff: localDiff,
+ remoteDiff: remoteDiff,
+ def: {
+ defaults:{},
+ icon:"subflow.png",
+ category: "subflows",
+ color: "#da9"
+ },
+ tab:remoteDiff.newConfig.subflows[subflowId],
+ remoteTab: remoteDiff.newConfig.subflows[subflowId]
+ }
+ diffList.editableList('addItem',el)
+ }
+ }
+ }
+ $("#sidebar-shade").show();
+ },
+ close: function() {
+ diffVisible = false;
+ $("#sidebar-shade").hide();
+
+ },
+ show: function() {
+
}
}
-
-
- $("#node-diff-filter-changed").addClass("selected");
- $("#node-diff-filter-all").removeClass("selected");
-
- $("#node-dialog-view-diff").dialog("open");
+ RED.tray.show(trayOptions);
}
+
function mergeDiff(diff) {
var currentConfig = diff.localDiff.currentConfig;
var localDiff = diff.localDiff;
diff --git a/editor/js/ui/tray.js b/editor/js/ui/tray.js
index 4e5dc0b0e..c8a09232b 100644
--- a/editor/js/ui/tray.js
+++ b/editor/js/ui/tray.js
@@ -34,6 +34,10 @@ RED.tray = (function() {
if (options.title) {
$(' '+options.title+' ').appendTo(header);
}
+ if (options.width === Infinity) {
+ options.maximized = true;
+ resizer.addClass('editor-tray-resize-maximised');
+ }
var buttonBar = $('').appendTo(header);
var primaryButton;
if (options.buttons) {
@@ -74,7 +78,8 @@ RED.tray = (function() {
};
stack.push(tray);
- el.draggable({
+ if (!options.maximized) {
+ el.draggable({
handle: resizer,
axis: "x",
start:function(event,ui) {
@@ -103,6 +108,7 @@ RED.tray = (function() {
tray.width = -ui.position.left;
}
});
+ }
function finishBuild() {
$("#header-shade").show();
@@ -175,7 +181,7 @@ RED.tray = (function() {
var tray = stack[stack.length-1];
var trayHeight = tray.tray.height()-tray.header.outerHeight()-tray.footer.outerHeight();
tray.body.height(trayHeight);
- if (tray.width > $("#editor-stack").position().left-8) {
+ if (tray.options.maximized || tray.width > $("#editor-stack").position().left-8) {
tray.width = $("#editor-stack").position().left-8;
tray.tray.width(tray.width);
// tray.body.parent().width(tray.width);
diff --git a/editor/js/ui/utils.js b/editor/js/ui/utils.js
index 3ca4e6864..89ab8c234 100644
--- a/editor/js/ui/utils.js
+++ b/editor/js/ui/utils.js
@@ -531,8 +531,10 @@ RED.utils = (function() {
if (exposeApi) {
element.prop('expand', function() { return function(targetPath, state) {
if (path === targetPath) {
- header.prop('toggle')(state);
- } else if (subElements[targetPath]) {
+ if (header.prop('toggle')) {
+ header.prop('toggle')(state);
+ }
+ } else if (subElements[targetPath] && subElements[targetPath].prop('expand') ) {
subElements[targetPath].prop('expand')(targetPath,state);
}
}});
diff --git a/editor/sass/diff.scss b/editor/sass/diff.scss
index 37263f5ec..451f83250 100644
--- a/editor/sass/diff.scss
+++ b/editor/sass/diff.scss
@@ -16,8 +16,6 @@
#node-dialog-view-diff {
- height: 600px;
-
.red-ui-editableList-container {
border-radius:1px;
padding:0;
@@ -132,11 +130,7 @@
table {
border-collapse: collapse;
table-layout:fixed;
-
- // Fix for table-layout: fixed on safari:
- max-width: none;
- width: auto;
- min-width: 100%;
+ width: 100%;
}
td, th {
border: 1px solid $secondary-border-color;
@@ -150,12 +144,16 @@
white-space:nowrap;
overflow:hidden;
}
+ &:hover {
+ background: #f9f9f9;
+ }
+
}
- td:first-child {
+ col:first-child {
width: 140px;
}
- td:not(:first-child) {
- width: calc( 100% - 140px);
+ col:not(:first-child) {
+ width: 100%;
}
td {
.node-diff-status {
@@ -179,8 +177,8 @@
width: 220px;
}
}
- td:not(:first-child) {
- width: calc( (100% - 140px) / 2);
+ col:not(:first-child) {
+ width:50%;
}
.node-diff-node-entry {
@@ -210,6 +208,9 @@
cursor: pointer;
padding: 0;
// background: #f6f6f6;
+ &:hover {
+ background: #f9f9f9;
+ }
}
.node-diff-tab-title-meta {
vertical-align: middle;
@@ -218,6 +219,9 @@
}
.node-diff-node-entry-header {
cursor: pointer;
+ &:hover {
+ background: #f9f9f9;
+ }
}
.node-diff-node-entry-node {
vertical-align: middle;
@@ -247,6 +251,9 @@
}
.node-diff-tab-title {
cursor: default;
+ &:hover {
+ background: none;
+ }
}
}
.node-diff-node-deleted {
diff --git a/editor/sass/editor.scss b/editor/sass/editor.scss
index a68eeedb8..9566d38dc 100644
--- a/editor/sass/editor.scss
+++ b/editor/sass/editor.scss
@@ -132,6 +132,11 @@
cursor: col-resize;
border-left: 1px solid $primary-border-color;
box-shadow: -1px 0 6px rgba(0,0,0,0.1);
+
+ &.editor-tray-resize-maximised {
+ background: $background-color;
+ cursor: default;
+ }
}
.editor-tray-resize-button {
@include workspace-button;
|