From d8d37a66e4770b98b64067c95d20db44921f80d7 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 3 May 2019 20:22:46 +0100 Subject: [PATCH] Namespace diff CSS --- .../editor-client/src/js/ui/deploy.js | 28 +- .../@node-red/editor-client/src/js/ui/diff.js | 395 +++++++++--------- .../src/js/ui/projects/tab-versionControl.js | 12 +- .../editor-client/src/sass/colors.scss | 8 + .../editor-client/src/sass/diff.scss | 209 ++++----- 5 files changed, 316 insertions(+), 336 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js index 621cc31b0..63b6a2066 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js @@ -176,13 +176,13 @@ RED.deploy = (function() { function resolveConflict(currentNodes, activeDeploy) { var message = $('
'); $('

').appendTo(message); - var conflictCheck = $('
'+ + var conflictCheck = $('
'+ '
'+ '
').appendTo(message); - var conflictAutoMerge = $('
'+ + var conflictAutoMerge = $('
'+ '
'+ '
').hide().appendTo(message); - var conflictManualMerge = $('
'+ + var conflictManualMerge = $('
'+ '
'+ '
').hide().appendTo(message); @@ -196,22 +196,22 @@ RED.deploy = (function() { } }, { - id: "node-dialog-confirm-deploy-review", + id: "red-ui-deploy-dialog-confirm-deploy-review", text: RED._("deploy.confirm.button.review"), class: "primary disabled", click: function() { - if (!$("#node-dialog-confirm-deploy-review").hasClass('disabled')) { + if (!$("#red-ui-deploy-dialog-confirm-deploy-review").hasClass('disabled')) { RED.diff.showRemoteDiff(); conflictNotification.close(); } } }, { - id: "node-dialog-confirm-deploy-merge", + id: "red-ui-deploy-dialog-confirm-deploy-merge", text: RED._("deploy.confirm.button.merge"), class: "primary disabled", click: function() { - if (!$("#node-dialog-confirm-deploy-merge").hasClass('disabled')) { + if (!$("#red-ui-deploy-dialog-confirm-deploy-merge").hasClass('disabled')) { RED.diff.mergeDiff(currentDiff); conflictNotification.close(); } @@ -220,7 +220,7 @@ RED.deploy = (function() { ]; if (activeDeploy) { buttons.push({ - id: "node-dialog-confirm-deploy-overwrite", + id: "red-ui-deploy-dialog-confirm-deploy-overwrite", text: RED._("deploy.confirm.button.overwrite"), class: "primary", click: function() { @@ -245,11 +245,11 @@ RED.deploy = (function() { var d = Object.keys(diff.conflicts); if (d.length === 0) { conflictAutoMerge.show(); - $("#node-dialog-confirm-deploy-merge").removeClass('disabled') + $("#red-ui-deploy-dialog-confirm-deploy-merge").removeClass('disabled') } else { conflictManualMerge.show(); } - $("#node-dialog-confirm-deploy-review").removeClass('disabled') + $("#red-ui-deploy-dialog-confirm-deploy-review").removeClass('disabled') },ellapsed); }) } @@ -355,13 +355,13 @@ RED.deploy = (function() { if (hasUnknown && !ignoreDeployWarnings.unknown) { showWarning = true; notificationMessage = "

"+RED._('deploy.confirm.unknown')+"

"+ - '
  • '+cropList(unknownNodes).map(function(n) { return sanitize(n) }).join("
  • ")+"

"+ + '

  • '+cropList(unknownNodes).map(function(n) { return sanitize(n) }).join("
  • ")+"

"+ RED._('deploy.confirm.confirm')+ "

"; notificationButtons= [ { - id: "node-dialog-confirm-deploy-deploy", + id: "red-ui-deploy-dialog-confirm-deploy-deploy", text: RED._("deploy.confirm.button.confirm"), class: "primary", click: function() { @@ -375,12 +375,12 @@ RED.deploy = (function() { invalidNodes.sort(sortNodeInfo); notificationMessage = "

"+RED._('deploy.confirm.improperlyConfigured')+"

"+ - '
  • '+cropList(invalidNodes.map(function(A) { return sanitize( (A.tab?"["+A.tab+"] ":"")+A.label+" ("+A.type+")")})).join("
  • ")+"

"+ + '

  • '+cropList(invalidNodes.map(function(A) { return sanitize( (A.tab?"["+A.tab+"] ":"")+A.label+" ("+A.type+")")})).join("
  • ")+"

"+ RED._('deploy.confirm.confirm')+ "

"; notificationButtons= [ { - id: "node-dialog-confirm-deploy-deploy", + id: "red-ui-deploy-dialog-confirm-deploy-deploy", text: RED._("deploy.confirm.button.confirm"), class: "primary", click: function() { diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js index 3238de72e..3951c4cdf 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js @@ -22,7 +22,7 @@ RED.diff = (function() { } function createDiffTable(container,CurrentDiff) { - var diffList = $('
    ').appendTo(container); + var diffList = $('
      ').appendTo(container); diffList.editableList({ addButton: false, height: "auto", @@ -34,22 +34,22 @@ RED.diff = (function() { var def = object.def; var conflicts = CurrentDiff.conflicts; - var tabDiv = $('
      ',{class:"node-diff-tab"}).appendTo(container); + var tabDiv = $('
      ',{class:"red-ui-diff-list-flow"}).appendTo(container); tabDiv.addClass('collapsed'); - var titleRow = $('
      ',{class:"node-diff-tab-title"}).appendTo(tabDiv); + var titleRow = $('
      ',{class:"red-ui-diff-list-flow-title"}).appendTo(tabDiv); var nodesDiv = $('
      ').appendTo(tabDiv); - var originalCell = $('
      ',{class:"node-diff-node-entry-cell"}).appendTo(titleRow); - var localCell = $('
      ',{class:"node-diff-node-entry-cell node-diff-node-local"}).appendTo(titleRow); + var originalCell = $('
      ',{class:"red-ui-diff-list-node-cell"}).appendTo(titleRow); + var localCell = $('
      ',{class:"red-ui-diff-list-node-cell red-ui-diff-list-node-local"}).appendTo(titleRow); var remoteCell; var selectState; if (remoteDiff) { - remoteCell = $('
      ',{class:"node-diff-node-entry-cell node-diff-node-remote"}).appendTo(titleRow); + remoteCell = $('
      ',{class:"red-ui-diff-list-node-cell red-ui-diff-list-node-remote"}).appendTo(titleRow); } - $('').appendTo(originalCell); + $('').appendTo(originalCell); createNodeIcon(tab,def).appendTo(originalCell); var tabForLabel = (object.newTab || object.tab).n; - var titleSpan = $('',{class:"node-diff-tab-title-meta"}).appendTo(originalCell); + var titleSpan = $('',{class:"red-ui-diff-list-flow-title-meta"}).appendTo(originalCell); if (tabForLabel.type === 'tab') { titleSpan.text(tabForLabel.label||tabForLabel.id); } else if (tab.type === 'subflow') { @@ -87,50 +87,50 @@ RED.diff = (function() { } } if (tab.type !== undefined) { - var div = $("
      ",{class:"node-diff-node-entry node-diff-node-props collapsed"}).appendTo(nodesDiv); - var row = $("
      ",{class:"node-diff-node-entry-header"}).appendTo(div); - var originalNodeDiv = $("
      ",{class:"node-diff-node-entry-cell"}).appendTo(row); - var localNodeDiv = $("
      ",{class:"node-diff-node-entry-cell node-diff-node-local"}).appendTo(row); + var div = $("
      ",{class:"red-ui-diff-list-node red-ui-diff-list-node-props collapsed"}).appendTo(nodesDiv); + var row = $("
      ",{class:"red-ui-diff-list-node-header"}).appendTo(div); + var originalNodeDiv = $("
      ",{class:"red-ui-diff-list-node-cell"}).appendTo(row); + var localNodeDiv = $("
      ",{class:"red-ui-diff-list-node-cell red-ui-diff-list-node-local"}).appendTo(row); var localChanged = false; var remoteChanged = false; if (!localDiff.newConfig.all[tab.id]) { - localNodeDiv.addClass("node-diff-empty"); + localNodeDiv.addClass("red-ui-diff-empty"); } else if (localDiff.added[tab.id]) { - localNodeDiv.addClass("node-diff-node-added"); + localNodeDiv.addClass("red-ui-diff-status-added"); localChanged = true; - $(' ').appendTo(localNodeDiv); + $(' ').appendTo(localNodeDiv); } else if (localDiff.changed[tab.id]) { - localNodeDiv.addClass("node-diff-node-changed"); + localNodeDiv.addClass("red-ui-diff-status-changed"); localChanged = true; - $(' ').appendTo(localNodeDiv); + $(' ').appendTo(localNodeDiv); } else { - localNodeDiv.addClass("node-diff-node-unchanged"); - $(' ').appendTo(localNodeDiv); + localNodeDiv.addClass("red-ui-diff-status-unchanged"); + $(' ').appendTo(localNodeDiv); } var remoteNodeDiv; if (remoteDiff) { - remoteNodeDiv = $("
      ",{class:"node-diff-node-entry-cell node-diff-node-remote"}).appendTo(row); + remoteNodeDiv = $("
      ",{class:"red-ui-diff-list-node-cell red-ui-diff-list-node-remote"}).appendTo(row); if (!remoteDiff.newConfig.all[tab.id]) { - remoteNodeDiv.addClass("node-diff-empty"); + remoteNodeDiv.addClass("red-ui-diff-empty"); if (remoteDiff.deleted[tab.id]) { remoteChanged = true; } } else if (remoteDiff.added[tab.id]) { - remoteNodeDiv.addClass("node-diff-node-added"); + remoteNodeDiv.addClass("red-ui-diff-status-added"); remoteChanged = true; - $(' ').appendTo(remoteNodeDiv); + $(' ').appendTo(remoteNodeDiv); } else if (remoteDiff.changed[tab.id]) { - remoteNodeDiv.addClass("node-diff-node-changed"); + remoteNodeDiv.addClass("red-ui-diff-status-changed"); remoteChanged = true; - $(' ').appendTo(remoteNodeDiv); + $(' ').appendTo(remoteNodeDiv); } else { - remoteNodeDiv.addClass("node-diff-node-unchanged"); - $(' ').appendTo(remoteNodeDiv); + remoteNodeDiv.addClass("red-ui-diff-status-unchanged"); + $(' ').appendTo(remoteNodeDiv); } } - $('').appendTo(originalNodeDiv); + $('').appendTo(originalNodeDiv); $('').text(RED._("diff.flowProperties")).appendTo(originalNodeDiv); row.on("click", function(evt) { @@ -143,13 +143,13 @@ RED.diff = (function() { if (conflicts[tab.id]) { flowStats.conflicts++; - if (!localNodeDiv.hasClass("node-diff-empty")) { - $('').prependTo(localNodeDiv); + if (!localNodeDiv.hasClass("red-ui-diff-empty")) { + $('').prependTo(localNodeDiv); } - if (!remoteNodeDiv.hasClass("node-diff-empty")) { - $('').prependTo(remoteNodeDiv); + if (!remoteNodeDiv.hasClass("red-ui-diff-empty")) { + $('').prependTo(remoteNodeDiv); } - div.addClass("node-diff-node-entry-conflict"); + div.addClass("red-ui-diff-list-node-conflict"); } else { selectState = CurrentDiff.resolutions[tab.id]; } @@ -157,7 +157,7 @@ RED.diff = (function() { createNodeConflictRadioBoxes(tab,div,localNodeDiv,remoteNodeDiv,true,!conflicts[tab.id],selectState,CurrentDiff); } } - // var stats = $('',{class:"node-diff-tab-stats"}).appendTo(titleRow); + // var stats = $('',{class:"red-ui-diff-list-flow-stats"}).appendTo(titleRow); var localNodeCount = 0; var remoteNodeCount = 0; var seen = {}; @@ -183,20 +183,20 @@ RED.diff = (function() { }); } titleRow.on("click", function(evt) { - // if (titleRow.parent().find(".node-diff-node-entry:not(.hide)").length > 0) { + // if (titleRow.parent().find(".red-ui-diff-list-node:not(.hide)").length > 0) { titleRow.parent().toggleClass('collapsed'); if ($(this).parent().hasClass('collapsed')) { - $(this).parent().find('.node-diff-node-entry').addClass('collapsed'); + $(this).parent().find('.red-ui-diff-list-node').addClass('collapsed'); $(this).parent().find('.red-ui-debug-msg-element').addClass('collapsed'); } // } }) if (localDiff.deleted[tab.id]) { - $(' ').appendTo(localCell); + $(' ').appendTo(localCell); } else if (object.newTab) { if (localDiff.added[tab.id]) { - $(' ').appendTo(localCell); + $(' ').appendTo(localCell); } else { if (tab.id) { if (localDiff.changed[tab.id]) { @@ -205,37 +205,37 @@ RED.diff = (function() { flowStats.local.unchangedCount++; } } - var localStats = $('',{class:"node-diff-tab-stats"}).appendTo(localCell); - $('').text(RED._('diff.nodeCount',{count:localNodeCount})).appendTo(localStats); + var localStats = $('',{class:"red-ui-diff-list-flow-stats"}).appendTo(localCell); + $('').text(RED._('diff.nodeCount',{count:localNodeCount})).appendTo(localStats); if (flowStats.conflicts + flowStats.local.addedCount + flowStats.local.changedCount + flowStats.local.deletedCount > 0) { - $(' [ ').appendTo(localStats); + $(' [ ').appendTo(localStats); if (flowStats.conflicts > 0) { - $(' '+flowStats.conflicts+'').appendTo(localStats); + $(' '+flowStats.conflicts+'').appendTo(localStats); } if (flowStats.local.addedCount > 0) { - $(' '+flowStats.local.addedCount+'').appendTo(localStats); + $(' '+flowStats.local.addedCount+'').appendTo(localStats); } if (flowStats.local.changedCount > 0) { - $(' '+flowStats.local.changedCount+'').appendTo(localStats); + $(' '+flowStats.local.changedCount+'').appendTo(localStats); } if (flowStats.local.deletedCount > 0) { - $(' '+flowStats.local.deletedCount+'').appendTo(localStats); + $(' '+flowStats.local.deletedCount+'').appendTo(localStats); } - $(' ] ').appendTo(localStats); + $(' ] ').appendTo(localStats); } } } else { - localCell.addClass("node-diff-empty"); + localCell.addClass("red-ui-diff-empty"); } if (remoteDiff) { if (remoteDiff.deleted[tab.id]) { - $(' ').appendTo(remoteCell); + $(' ').appendTo(remoteCell); } else if (object.remoteTab) { if (remoteDiff.added[tab.id]) { - $(' ').appendTo(remoteCell); + $(' ').appendTo(remoteCell); } else { if (tab.id) { if (remoteDiff.changed[tab.id]) { @@ -244,31 +244,31 @@ RED.diff = (function() { flowStats.remote.unchangedCount++; } } - var remoteStats = $('',{class:"node-diff-tab-stats"}).appendTo(remoteCell); - $('').text(RED._('diff.nodeCount',{count:remoteNodeCount})).appendTo(remoteStats); + var remoteStats = $('',{class:"red-ui-diff-list-flow-stats"}).appendTo(remoteCell); + $('').text(RED._('diff.nodeCount',{count:remoteNodeCount})).appendTo(remoteStats); if (flowStats.conflicts + flowStats.remote.addedCount + flowStats.remote.changedCount + flowStats.remote.deletedCount > 0) { - $(' [ ').appendTo(remoteStats); + $(' [ ').appendTo(remoteStats); if (flowStats.conflicts > 0) { - $(' '+flowStats.conflicts+'').appendTo(remoteStats); + $(' '+flowStats.conflicts+'').appendTo(remoteStats); } if (flowStats.remote.addedCount > 0) { - $(' '+flowStats.remote.addedCount+'').appendTo(remoteStats); + $(' '+flowStats.remote.addedCount+'').appendTo(remoteStats); } if (flowStats.remote.changedCount > 0) { - $(' '+flowStats.remote.changedCount+'').appendTo(remoteStats); + $(' '+flowStats.remote.changedCount+'').appendTo(remoteStats); } if (flowStats.remote.deletedCount > 0) { - $(' '+flowStats.remote.deletedCount+'').appendTo(remoteStats); + $(' '+flowStats.remote.deletedCount+'').appendTo(remoteStats); } - $(' ] ').appendTo(remoteStats); + $(' ] ').appendTo(remoteStats); } } } else { - remoteCell.addClass("node-diff-empty"); + remoteCell.addClass("red-ui-diff-empty"); } selectState = ""; if (flowStats.conflicts > 0) { - titleRow.addClass("node-diff-node-entry-conflict"); + titleRow.addClass("red-ui-diff-list-node-conflict"); } else { selectState = CurrentDiff.resolutions[tab.id]; } @@ -279,8 +279,8 @@ RED.diff = (function() { } } - if (tabDiv.find(".node-diff-node-entry").length === 0) { - tabDiv.addClass("node-diff-tab-empty"); + if (tabDiv.find(".red-ui-diff-list-node").length === 0) { + tabDiv.addClass("red-ui-diff-list-flow-empty"); } container.i18n(); } @@ -288,10 +288,10 @@ RED.diff = (function() { return diffList; } function buildDiffPanel(container,diff,options) { - var diffPanel = $('
      ').appendTo(container); - var diffHeaders = $('
      ').appendTo(diffPanel); + var diffPanel = $('
      ').appendTo(container); + var diffHeaders = $('
      ').appendTo(diffPanel); if (options.mode === "merge") { - diffPanel.addClass("node-dialog-view-diff-panel-merge"); + diffPanel.addClass("red-ui-diff-panel-merge"); } var diffList = createDiffTable(diffPanel, diff); @@ -304,13 +304,13 @@ RED.diff = (function() { if (remoteDiff !== undefined) { - diffPanel.addClass('node-diff-three-way'); + diffPanel.addClass('red-ui-diff-three-way'); var localTitle = options.oldRevTitle || RED._('diff.local'); var remoteTitle = options.newRevTitle || RED._('diff.remote'); $('
      ').text(localTitle).appendTo(diffHeaders); $('
      ').text(remoteTitle).appendTo(diffHeaders); } else { - diffPanel.removeClass('node-diff-three-way'); + diffPanel.removeClass('red-ui-diff-three-way'); } return { @@ -458,7 +458,7 @@ RED.diff = (function() { }; } function formatWireProperty(wires,allNodes) { - var result = $("
      ",{class:"node-diff-property-wires"}) + var result = $("
      ",{class:"red-ui-diff-list-wires"}) var list = $("
        "); var c = 0; wires.forEach(function(p,i) { @@ -489,7 +489,7 @@ RED.diff = (function() { return result; } function createNodeIcon(node,def) { - var nodeDiv = $("
        ",{class:"node-diff-node-entry-node"}); + var nodeDiv = $("
        ",{class:"red-ui-diff-list-node-icon"}); var colour = RED.utils.getNodeColor(node.type,def); var icon_url = RED.utils.getNodeIcon(def,node); if (node.type === 'tab') { @@ -503,11 +503,10 @@ RED.diff = (function() { return nodeDiv; } function createNode(node,def) { - var nodeTitleDiv = $("
        ",{class:"node-diff-node-entry-title"}) + var nodeTitleDiv = $("
        ",{class:"red-ui-diff-list-node-title"}) createNodeIcon(node,def).appendTo(nodeTitleDiv); - var contentDiv = $('
        ',{class:"node-diff-node-description"}).appendTo(nodeTitleDiv); var nodeLabel = node.label || node.name || node.id; - $('',{class:"node-diff-node-label"}).text(nodeLabel).appendTo(contentDiv); + $('
        ',{class:"red-ui-diff-list-node-description"}).text(nodeLabel).appendTo(nodeTitleDiv); return nodeTitleDiv; } function createNodeDiffRow(node,stats,CurrentDiff) { @@ -559,80 +558,80 @@ RED.diff = (function() { def = {}; } } - var div = $("
        ",{class:"node-diff-node-entry collapsed"}); - var row = $("
        ",{class:"node-diff-node-entry-header"}).appendTo(div); + var div = $("
        ",{class:"red-ui-diff-list-node collapsed"}); + var row = $("
        ",{class:"red-ui-diff-list-node-header"}).appendTo(div); - var originalNodeDiv = $("
        ",{class:"node-diff-node-entry-cell"}).appendTo(row); - var localNodeDiv = $("
        ",{class:"node-diff-node-entry-cell node-diff-node-local"}).appendTo(row); + var originalNodeDiv = $("
        ",{class:"red-ui-diff-list-node-cell"}).appendTo(row); + var localNodeDiv = $("
        ",{class:"red-ui-diff-list-node-cell red-ui-diff-list-node-local"}).appendTo(row); var remoteNodeDiv; var chevron; if (remoteDiff) { - remoteNodeDiv = $("
        ",{class:"node-diff-node-entry-cell node-diff-node-remote"}).appendTo(row); + remoteNodeDiv = $("
        ",{class:"red-ui-diff-list-node-cell red-ui-diff-list-node-remote"}).appendTo(row); } - $('').appendTo(originalNodeDiv); + $('').appendTo(originalNodeDiv); if (unChanged) { stats.local.unchangedCount++; createNode(node,def).appendTo(originalNodeDiv); - localNodeDiv.addClass("node-diff-node-unchanged"); - $(' ').appendTo(localNodeDiv); + localNodeDiv.addClass("red-ui-diff-status-unchanged"); + $(' ').appendTo(localNodeDiv); if (remoteDiff) { stats.remote.unchangedCount++; - remoteNodeDiv.addClass("node-diff-node-unchanged"); - $(' ').appendTo(remoteNodeDiv); + remoteNodeDiv.addClass("red-ui-diff-status-unchanged"); + $(' ').appendTo(remoteNodeDiv); } - div.addClass("node-diff-node-unchanged"); + div.addClass("red-ui-diff-status-unchanged"); } else if (localDiff.added[node.id]) { - localNodeDiv.addClass("node-diff-node-added"); + localNodeDiv.addClass("red-ui-diff-status-added"); if (remoteNodeDiv) { - remoteNodeDiv.addClass("node-diff-empty"); + remoteNodeDiv.addClass("red-ui-diff-empty"); } - $(' ').appendTo(localNodeDiv); + $(' ').appendTo(localNodeDiv); createNode(node,def).appendTo(originalNodeDiv); } else if (remoteDiff && remoteDiff.added[node.id]) { - localNodeDiv.addClass("node-diff-empty"); - remoteNodeDiv.addClass("node-diff-node-added"); - $(' ').appendTo(remoteNodeDiv); + localNodeDiv.addClass("red-ui-diff-empty"); + remoteNodeDiv.addClass("red-ui-diff-status-added"); + $(' ').appendTo(remoteNodeDiv); createNode(node,def).appendTo(originalNodeDiv); } else { createNode(node,def).appendTo(originalNodeDiv); if (localDiff.moved[node.id]) { var localN = localDiff.newConfig.all[node.id]; if (!localDiff.deleted[node.z] && node.z !== localN.z && node.z !== "" && !localDiff.newConfig.all[node.z]) { - localNodeDiv.addClass("node-diff-empty"); + localNodeDiv.addClass("red-ui-diff-empty"); } else { - localNodeDiv.addClass("node-diff-node-moved"); + localNodeDiv.addClass("red-ui-diff-status-moved"); var localMovedMessage = ""; if (node.z === localN.z) { localMovedMessage = RED._("diff.type.movedFrom",{id:(localDiff.currentConfig.all[node.id].z||'global')}); } else { localMovedMessage = RED._("diff.type.movedTo",{id:(localN.z||'global')}); } - $(' '+localMovedMessage+'').appendTo(localNodeDiv); + $(' '+localMovedMessage+'').appendTo(localNodeDiv); } localChanged = true; } else if (localDiff.deleted[node.z]) { - localNodeDiv.addClass("node-diff-empty"); + localNodeDiv.addClass("red-ui-diff-empty"); localChanged = true; } else if (localDiff.deleted[node.id]) { - localNodeDiv.addClass("node-diff-node-deleted"); - $(' ').appendTo(localNodeDiv); + localNodeDiv.addClass("red-ui-diff-status-deleted"); + $(' ').appendTo(localNodeDiv); localChanged = true; } else if (localDiff.changed[node.id]) { if (localDiff.newConfig.all[node.id].z !== node.z) { - localNodeDiv.addClass("node-diff-empty"); + localNodeDiv.addClass("red-ui-diff-empty"); } else { - localNodeDiv.addClass("node-diff-node-changed"); - $(' ').appendTo(localNodeDiv); + localNodeDiv.addClass("red-ui-diff-status-changed"); + $(' ').appendTo(localNodeDiv); localChanged = true; } } else { if (localDiff.newConfig.all[node.id].z !== node.z) { - localNodeDiv.addClass("node-diff-empty"); + localNodeDiv.addClass("red-ui-diff-empty"); } else { stats.local.unchangedCount++; - localNodeDiv.addClass("node-diff-node-unchanged"); - $(' ').appendTo(localNodeDiv); + localNodeDiv.addClass("red-ui-diff-status-unchanged"); + $(' ').appendTo(localNodeDiv); } } @@ -640,36 +639,36 @@ RED.diff = (function() { if (remoteDiff.moved[node.id]) { var remoteN = remoteDiff.newConfig.all[node.id]; if (!remoteDiff.deleted[node.z] && node.z !== remoteN.z && node.z !== "" && !remoteDiff.newConfig.all[node.z]) { - remoteNodeDiv.addClass("node-diff-empty"); + remoteNodeDiv.addClass("red-ui-diff-empty"); } else { - remoteNodeDiv.addClass("node-diff-node-moved"); + remoteNodeDiv.addClass("red-ui-diff-status-moved"); var remoteMovedMessage = ""; if (node.z === remoteN.z) { remoteMovedMessage = RED._("diff.type.movedFrom",{id:(remoteDiff.currentConfig.all[node.id].z||'global')}); } else { remoteMovedMessage = RED._("diff.type.movedTo",{id:(remoteN.z||'global')}); } - $(' '+remoteMovedMessage+'').appendTo(remoteNodeDiv); + $(' '+remoteMovedMessage+'').appendTo(remoteNodeDiv); } } else if (remoteDiff.deleted[node.z]) { - remoteNodeDiv.addClass("node-diff-empty"); + remoteNodeDiv.addClass("red-ui-diff-empty"); } else if (remoteDiff.deleted[node.id]) { - remoteNodeDiv.addClass("node-diff-node-deleted"); - $(' ').appendTo(remoteNodeDiv); + remoteNodeDiv.addClass("red-ui-diff-status-deleted"); + $(' ').appendTo(remoteNodeDiv); } else if (remoteDiff.changed[node.id]) { if (remoteDiff.newConfig.all[node.id].z !== node.z) { - remoteNodeDiv.addClass("node-diff-empty"); + remoteNodeDiv.addClass("red-ui-diff-empty"); } else { - remoteNodeDiv.addClass("node-diff-node-changed"); - $(' ').appendTo(remoteNodeDiv); + remoteNodeDiv.addClass("red-ui-diff-status-changed"); + $(' ').appendTo(remoteNodeDiv); } } else { if (remoteDiff.newConfig.all[node.id].z !== node.z) { - remoteNodeDiv.addClass("node-diff-empty"); + remoteNodeDiv.addClass("red-ui-diff-empty"); } else { stats.remote.unchangedCount++; - remoteNodeDiv.addClass("node-diff-node-unchanged"); - $(' ').appendTo(remoteNodeDiv); + remoteNodeDiv.addClass("red-ui-diff-status-unchanged"); + $(' ').appendTo(remoteNodeDiv); } } } @@ -692,13 +691,13 @@ RED.diff = (function() { if (conflicted) { stats.conflicts++; - if (!localNodeDiv.hasClass("node-diff-empty")) { - $('').prependTo(localNodeDiv); + if (!localNodeDiv.hasClass("red-ui-diff-empty")) { + $('').prependTo(localNodeDiv); } - if (!remoteNodeDiv.hasClass("node-diff-empty")) { - $('').prependTo(remoteNodeDiv); + if (!remoteNodeDiv.hasClass("red-ui-diff-empty")) { + $('').prependTo(remoteNodeDiv); } - div.addClass("node-diff-node-entry-conflict"); + div.addClass("red-ui-diff-list-node-conflict"); } else { selectState = CurrentDiff.resolutions[node.id]; } @@ -707,7 +706,7 @@ RED.diff = (function() { row.on("click", function(evt) { $(this).parent().toggleClass('collapsed'); - if($(this).siblings('.node-diff-node-entry-properties').length === 0) { + if($(this).siblings('.red-ui-diff-list-node-properties').length === 0) { createNodePropertiesTable(def,node,localNode,remoteNode).appendTo(div); } }); @@ -722,7 +721,7 @@ RED.diff = (function() { remoteNode = remoteNodeObj.node; } - var nodePropertiesDiv = $("
        ",{class:"node-diff-node-entry-properties"}); + var nodePropertiesDiv = $("
        ",{class:"red-ui-diff-list-node-properties"}); var nodePropertiesTable = $("").appendTo(nodePropertiesDiv); var nodePropertiesTableCols = $('').appendTo(nodePropertiesTable); if (remoteNode !== undefined) { @@ -742,25 +741,25 @@ RED.diff = (function() { var status; row = $("").appendTo(nodePropertiesTableBody); - $("").appendTo(nodePropertiesTableBody); - $("").appendTo(nodePropertiesTableBody); - $("").appendTo(nodePropertiesTableBody); - var propertyNameCell = $("
        ",{class:"node-diff-property-cell-label"}).text("id").appendTo(row); - localCell = $("",{class:"node-diff-property-cell node-diff-node-local"}).appendTo(row); + $("",{class:"red-ui-diff-list-cell-label"}).text("id").appendTo(row); + localCell = $("",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row); if (localNode) { - localCell.addClass("node-diff-node-unchanged"); - $('').appendTo(localCell); - element = $('').appendTo(localCell); + localCell.addClass("red-ui-diff-status-unchanged"); + $('').appendTo(localCell); + element = $('').appendTo(localCell); propertyElements['local.id'] = RED.utils.createObjectElement(localNode.id).appendTo(element); } else { - localCell.addClass("node-diff-empty"); + localCell.addClass("red-ui-diff-empty"); } if (remoteNode !== undefined) { - remoteCell = $("",{class:"node-diff-property-cell node-diff-node-remote"}).appendTo(row); - remoteCell.addClass("node-diff-node-unchanged"); + remoteCell = $("",{class:"red-ui-diff-list-cell red-ui-diff-list-node-remote"}).appendTo(row); + remoteCell.addClass("red-ui-diff-status-unchanged"); if (remoteNode) { - $('').appendTo(remoteCell); - element = $('').appendTo(remoteCell); + $('').appendTo(remoteCell); + element = $('').appendTo(remoteCell); propertyElements['remote.id'] = RED.utils.createObjectElement(remoteNode.id).appendTo(element); } else { - remoteCell.addClass("node-diff-empty"); + remoteCell.addClass("red-ui-diff-empty"); } } @@ -785,12 +784,12 @@ RED.diff = (function() { conflict = true; } row = $("
        ",{class:"node-diff-property-cell-label"}).text("position").appendTo(row); - localCell = $("",{class:"node-diff-property-cell node-diff-node-local"}).appendTo(row); + $("",{class:"red-ui-diff-list-cell-label"}).text("position").appendTo(row); + localCell = $("",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row); if (localNode) { localCell.addClass("node-diff-node-"+(localChanged?"changed":"unchanged")); - $(''+(localChanged?'':'')+'').appendTo(localCell); - element = $('').appendTo(localCell); + $(''+(localChanged?'':'')+'').appendTo(localCell); + element = $('').appendTo(localCell); propertyElements['local.position'] = RED.utils.createObjectElement({x:localNode.x,y:localNode.y}, { path: "position", @@ -803,15 +802,15 @@ RED.diff = (function() { } ).appendTo(element); } else { - localCell.addClass("node-diff-empty"); + localCell.addClass("red-ui-diff-empty"); } if (remoteNode !== undefined) { - remoteCell = $("",{class:"node-diff-property-cell node-diff-node-remote"}).appendTo(row); + remoteCell = $("",{class:"red-ui-diff-list-cell red-ui-diff-list-node-remote"}).appendTo(row); remoteCell.addClass("node-diff-node-"+(remoteChanged?"changed":"unchanged")); if (remoteNode) { - $(''+(remoteChanged?'':'')+'').appendTo(remoteCell); - element = $('').appendTo(remoteCell); + $(''+(remoteChanged?'':'')+'').appendTo(remoteCell); + element = $('').appendTo(remoteCell); propertyElements['remote.position'] = RED.utils.createObjectElement({x:remoteNode.x,y:remoteNode.y}, { path: "position", @@ -824,7 +823,7 @@ RED.diff = (function() { } ).appendTo(element); } else { - remoteCell.addClass("node-diff-empty"); + remoteCell.addClass("red-ui-diff-empty"); } } } @@ -853,34 +852,34 @@ RED.diff = (function() { conflict = true; } row = $("
        ",{class:"node-diff-property-cell-label"}).text("wires").appendTo(row); - localCell = $("",{class:"node-diff-property-cell node-diff-node-local"}).appendTo(row); + $("",{class:"red-ui-diff-list-cell-label"}).text("wires").appendTo(row); + localCell = $("",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row); if (localNode) { if (!conflict) { localCell.addClass("node-diff-node-"+(localChanged?"changed":"unchanged")); - $(''+(localChanged?'':'')+'').appendTo(localCell); + $(''+(localChanged?'':'')+'').appendTo(localCell); } else { - localCell.addClass("node-diff-node-conflict"); - $('').appendTo(localCell); + localCell.addClass("red-ui-diff-status-conflict"); + $('').appendTo(localCell); } formatWireProperty(localNode.wires,localNodeObj.all).appendTo(localCell); } else { - localCell.addClass("node-diff-empty"); + localCell.addClass("red-ui-diff-empty"); } if (remoteNode !== undefined) { - remoteCell = $("",{class:"node-diff-property-cell node-diff-node-remote"}).appendTo(row); + remoteCell = $("",{class:"red-ui-diff-list-cell red-ui-diff-list-node-remote"}).appendTo(row); if (remoteNode) { if (!conflict) { remoteCell.addClass("node-diff-node-"+(remoteChanged?"changed":"unchanged")); - $(''+(remoteChanged?'':'')+'').appendTo(remoteCell); + $(''+(remoteChanged?'':'')+'').appendTo(remoteCell); } else { - remoteCell.addClass("node-diff-node-conflict"); - $('').appendTo(remoteCell); + remoteCell.addClass("red-ui-diff-status-conflict"); + $('').appendTo(remoteCell); } formatWireProperty(remoteNode.wires,remoteNodeObj.all).appendTo(remoteCell); } else { - remoteCell.addClass("node-diff-empty"); + remoteCell.addClass("red-ui-diff-empty"); } } } @@ -926,17 +925,17 @@ RED.diff = (function() { } row = $("
        ",{class:"node-diff-property-cell-label"}).text(d).appendTo(row); - localCell = $("",{class:"node-diff-property-cell node-diff-node-local"}).appendTo(row); + var propertyNameCell = $("",{class:"red-ui-diff-list-cell-label"}).text(d).appendTo(row); + localCell = $("",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row); if (localNode) { if (!conflict) { localCell.addClass("node-diff-node-"+(localChanged?"changed":"unchanged")); - $(''+(localChanged?'':'')+'').appendTo(localCell); + $(''+(localChanged?'':'')+'').appendTo(localCell); } else { - localCell.addClass("node-diff-node-conflict"); - $('').appendTo(localCell); + localCell.addClass("red-ui-diff-status-conflict"); + $('').appendTo(localCell); } - element = $('').appendTo(localCell); + element = $('').appendTo(localCell); propertyElements['local.'+d] = RED.utils.createObjectElement(localNode[d], { path: d, @@ -949,19 +948,19 @@ RED.diff = (function() { } ).appendTo(element); } else { - localCell.addClass("node-diff-empty"); + localCell.addClass("red-ui-diff-empty"); } if (remoteNode !== undefined) { - remoteCell = $("",{class:"node-diff-property-cell node-diff-node-remote"}).appendTo(row); + remoteCell = $("",{class:"red-ui-diff-list-cell red-ui-diff-list-node-remote"}).appendTo(row); if (remoteNode) { if (!conflict) { remoteCell.addClass("node-diff-node-"+(remoteChanged?"changed":"unchanged")); - $(''+(remoteChanged?'':'')+'').appendTo(remoteCell); + $(''+(remoteChanged?'':'')+'').appendTo(remoteCell); } else { - remoteCell.addClass("node-diff-node-conflict"); - $('').appendTo(remoteCell); + remoteCell.addClass("red-ui-diff-status-conflict"); + $('').appendTo(remoteCell); } - element = $('').appendTo(remoteCell); + element = $('').appendTo(remoteCell); propertyElements['remote.'+d] = RED.utils.createObjectElement(remoteNode[d], { path: d, @@ -974,12 +973,12 @@ RED.diff = (function() { } ).appendTo(element); } else { - remoteCell.addClass("node-diff-empty"); + remoteCell.addClass("red-ui-diff-empty"); } } if (localNode && remoteNode && typeof localNode[d] === "string") { if (/\n/.test(localNode[d]) || /\n/.test(remoteNode[d])) { - $('').on("click", function() { + $('').on("click", function() { showTextDiff(localNode[d],remoteNode[d]); }).appendTo(propertyNameCell); } @@ -990,10 +989,10 @@ RED.diff = (function() { return nodePropertiesDiv; } function createNodeConflictRadioBoxes(node,row,localDiv,remoteDiv,propertiesTable,hide,state,diff) { - var safeNodeId = "node-diff-selectbox-"+node.id.replace(/\./g,'-')+(propertiesTable?"-props":""); + var safeNodeId = "red-ui-diff-selectbox-"+node.id.replace(/\./g,'-')+(propertiesTable?"-props":""); var className = ""; if (node.z||propertiesTable) { - className = "node-diff-selectbox-tab-"+(propertiesTable?node.id:node.z).replace(/\./g,'-'); + className = "red-ui-diff-selectbox-tab-"+(propertiesTable?node.id:node.z).replace(/\./g,'-'); } var titleRow = !propertiesTable && (node.type === 'tab' || node.type === 'subflow'); var changeHandler = function(evt) { @@ -1001,21 +1000,21 @@ RED.diff = (function() { if (node.type === undefined) { // TODO: handle globals } else if (titleRow) { - className = "node-diff-selectbox-tab-"+node.id.replace(/\./g,'-'); + className = "red-ui-diff-selectbox-tab-"+node.id.replace(/\./g,'-'); $("."+className+"-"+this.value).prop('checked',true); if (this.value === 'local') { - $("."+className+"-"+this.value).closest(".node-diff-node-entry").addClass("node-diff-select-local"); - $("."+className+"-"+this.value).closest(".node-diff-node-entry").removeClass("node-diff-select-remote"); + $("."+className+"-"+this.value).closest(".red-ui-diff-list-node").addClass("node-diff-select-local"); + $("."+className+"-"+this.value).closest(".red-ui-diff-list-node").removeClass("node-diff-select-remote"); } else { - $("."+className+"-"+this.value).closest(".node-diff-node-entry").removeClass("node-diff-select-local"); - $("."+className+"-"+this.value).closest(".node-diff-node-entry").addClass("node-diff-select-remote"); + $("."+className+"-"+this.value).closest(".red-ui-diff-list-node").removeClass("node-diff-select-local"); + $("."+className+"-"+this.value).closest(".red-ui-diff-list-node").addClass("node-diff-select-remote"); } } else { // Individual node or properties table - var parentId = "node-diff-selectbox-"+(propertiesTable?node.id:node.z).replace(/\./g,'-'); + var parentId = "red-ui-diff-selectbox-"+(propertiesTable?node.id:node.z).replace(/\./g,'-'); $('#'+parentId+"-local").prop('checked',false); $('#'+parentId+"-remote").prop('checked',false); - var titleRowDiv = $('#'+parentId+"-local").closest(".node-diff-tab").find(".node-diff-tab-title"); + var titleRowDiv = $('#'+parentId+"-local").closest(".red-ui-diff-list-flow").find(".red-ui-diff-list-flow-title"); titleRowDiv.removeClass("node-diff-select-local"); titleRowDiv.removeClass("node-diff-select-remote"); } @@ -1029,16 +1028,16 @@ RED.diff = (function() { refreshConflictHeader(diff); } - var localSelectDiv = $('