'+
'
'+
'
'+
'
'+
- ''+
+ ''+
'
'+
'
'+
'
'+
@@ -221,9 +221,9 @@ RED.clipboard = (function() {
'
'+
'
';
@@ -255,7 +255,7 @@ RED.clipboard = (function() {
clearTimeout(validateImportTimeout);
}
validateImportTimeout = setTimeout(function() {
- var importInput = $("#clipboard-import");
+ var importInput = $("#red-ui-clipboard-dialog-import-text");
var v = importInput.val().trim();
if (v === "") {
popover.close(true);
@@ -371,7 +371,7 @@ RED.clipboard = (function() {
currentPopoverError = null;
}
if (tab.id === "red-ui-clipboard-dialog-import-tab-clipboard") {
- $("#clipboard-import").trigger("focus");
+ $("#red-ui-clipboard-dialog-import-text").trigger("focus");
} else {
libraryBrowser.focus();
}
@@ -390,7 +390,7 @@ RED.clipboard = (function() {
tabs.activateTab("red-ui-clipboard-dialog-import-tab-"+mode);
if (mode === 'clipboard') {
setTimeout(function() {
- $("#clipboard-import").trigger("focus");
+ $("#red-ui-clipboard-dialog-import-text").trigger("focus");
},100)
}
@@ -418,10 +418,10 @@ RED.clipboard = (function() {
$("#red-ui-clipboard-dialog-export").hide();
$("#red-ui-clipboard-dialog-download").hide();
$("#red-ui-clipboard-dialog-ok").button("disable");
- $("#clipboard-import").on("keyup", validateImport);
- $("#clipboard-import").on('paste',function() { setTimeout(validateImport,10)});
+ $("#red-ui-clipboard-dialog-import-text").on("keyup", validateImport);
+ $("#red-ui-clipboard-dialog-import-text").on('paste',function() { setTimeout(validateImport,10)});
- $("#import-tab > a").on("click", function(evt) {
+ $("#red-ui-clipboard-dialog-import-opt > a").on("click", function(evt) {
evt.preventDefault();
if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
return;
@@ -430,22 +430,22 @@ RED.clipboard = (function() {
$(this).addClass('selected');
});
- $("#import-file-upload").on("change", function() {
+ $("#red-ui-clipboard-dialog-import-file-upload").on("change", function() {
var fileReader = new FileReader();
fileReader.onload = function () {
- $("#clipboard-import").val(fileReader.result);
+ $("#red-ui-clipboard-dialog-import-text").val(fileReader.result);
validateImport();
};
fileReader.readAsText($(this).prop('files')[0]);
})
- $("#import-file-upload-btn").on("click", function(evt) {
+ $("#red-ui-clipboard-dialog-import-file-upload-btn").on("click", function(evt) {
evt.preventDefault();
- $("#import-file-upload").trigger("click");
+ $("#red-ui-clipboard-dialog-import-file-upload").trigger("click");
})
dialog.dialog("option","title",RED._("clipboard.importNodes")).dialog("open");
popover = RED.popover.create({
- target: $("#clipboard-import"),
+ target: $("#red-ui-clipboard-dialog-import-text"),
trigger: "manual",
direction: "bottom",
content: ""
@@ -509,35 +509,35 @@ RED.clipboard = (function() {
$("#red-ui-clipboard-dialog-tab-library-name").val("flows.json").select();
dialogContainer.i18n();
- var format = RED.settings.flowFilePretty ? "export-format-full" : "export-format-mini";
+ var format = RED.settings.flowFilePretty ? "red-ui-clipboard-dialog-export-fmt-full" : "red-ui-clipboard-dialog-export-fmt-mini";
- $("#export-format-group > a").on("click", function(evt) {
+ $("#red-ui-clipboard-dialog-export-fmt-group > a").on("click", function(evt) {
evt.preventDefault();
if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
- $("#clipboard-export").trigger("focus");
+ $("#red-ui-clipboard-dialog-export-text").trigger("focus");
return;
}
$(this).parent().children().removeClass('selected');
$(this).addClass('selected');
- var flow = $("#clipboard-export").val();
+ var flow = $("#red-ui-clipboard-dialog-export-text").val();
if (flow.length > 0) {
var nodes = JSON.parse(flow);
format = $(this).attr('id');
- if (format === 'export-format-full') {
+ if (format === 'red-ui-clipboard-dialog-export-fmt-full') {
flow = JSON.stringify(nodes,null,4);
} else {
flow = JSON.stringify(nodes);
}
- $("#clipboard-export").val(flow);
- setTimeout(function() { $("#clipboard-export").scrollTop(0); },50);
+ $("#red-ui-clipboard-dialog-export-text").val(flow);
+ setTimeout(function() { $("#red-ui-clipboard-dialog-export-text").scrollTop(0); },50);
- $("#clipboard-export").trigger("focus");
+ $("#red-ui-clipboard-dialog-export-text").trigger("focus");
}
});
- $("#export-range-group > a").on("click", function(evt) {
+ $("#red-ui-clipboard-dialog-export-rng-group > a").on("click", function(evt) {
evt.preventDefault();
if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
return;
@@ -547,7 +547,7 @@ RED.clipboard = (function() {
var type = $(this).attr('id');
var flow = "";
var nodes = null;
- if (type === 'export-range-selected') {
+ if (type === 'red-ui-clipboard-dialog-export-rng-selected') {
var selection = RED.workspaces.selection();
if (selection.length > 0) {
nodes = [];
@@ -560,30 +560,30 @@ RED.clipboard = (function() {
}
// Don't include the subflow meta-port nodes in the exported selection
nodes = RED.nodes.createExportableNodeSet(nodes.filter(function(n) { return n.type !== 'subflow'}));
- } else if (type === 'export-range-flow') {
+ } else if (type === 'red-ui-clipboard-dialog-export-rng-flow') {
var activeWorkspace = RED.workspaces.active();
nodes = RED.nodes.filterNodes({z:activeWorkspace});
var parentNode = RED.nodes.workspace(activeWorkspace)||RED.nodes.subflow(activeWorkspace);
nodes.unshift(parentNode);
nodes = RED.nodes.createExportableNodeSet(nodes);
- } else if (type === 'export-range-full') {
+ } else if (type === 'red-ui-clipboard-dialog-export-rng-full') {
nodes = RED.nodes.createCompleteNodeSet(false);
}
if (nodes !== null) {
- if (format === "export-format-full") {
+ if (format === "red-ui-clipboard-dialog-export-fmt-full") {
flow = JSON.stringify(nodes,null,4);
} else {
flow = JSON.stringify(nodes);
}
}
if (flow.length > 0) {
- $("#export-copy").removeClass('disabled');
+ $("#red-ui-clipboard-dialog-export").removeClass('disabled');
} else {
- $("#export-copy").addClass('disabled');
+ $("#red-ui-clipboard-dialog-export").addClass('disabled');
}
- $("#clipboard-export").val(flow);
- setTimeout(function() { $("#clipboard-export").scrollTop(0); },50);
- $("#clipboard-export").trigger("focus");
+ $("#red-ui-clipboard-dialog-export-text").val(flow);
+ setTimeout(function() { $("#red-ui-clipboard-dialog-export-text").scrollTop(0); },50);
+ $("#red-ui-clipboard-dialog-export-text").trigger("focus");
})
$("#red-ui-clipboard-dialog-ok").hide();
@@ -591,24 +591,24 @@ RED.clipboard = (function() {
$("#red-ui-clipboard-dialog-export").hide();
var selection = RED.workspaces.selection();
if (selection.length > 0) {
- $("#export-range-selected").trigger("click");
+ $("#red-ui-clipboard-dialog-export-rng-selected").trigger("click");
} else {
selection = RED.view.selection();
if (selection.nodes) {
- $("#export-range-selected").trigger("click");
+ $("#red-ui-clipboard-dialog-export-rng-selected").trigger("click");
} else {
- $("#export-range-selected").addClass('disabled').removeClass('selected');
- $("#export-range-flow").trigger("click");
+ $("#red-ui-clipboard-dialog-export-rng-selected").addClass('disabled').removeClass('selected');
+ $("#red-ui-clipboard-dialog-export-rng-flow").trigger("click");
}
}
- if (format === "export-format-full") {
- $("#export-format-full").trigger("click");
+ if (format === "red-ui-clipboard-dialog-export-fmt-full") {
+ $("#red-ui-clipboard-dialog-export-fmt-full").trigger("click");
} else {
- $("#export-format-mini").trigger("click");
+ $("#red-ui-clipboard-dialog-export-fmt-mini").trigger("click");
}
dialog.dialog("option","title",RED._("clipboard.exportNodes")).dialog( "open" );
- $("#clipboard-export").trigger("focus");
+ $("#red-ui-clipboard-dialog-export-text").trigger("focus");
$("#red-ui-clipboard-dialog-cancel").show();
$("#red-ui-clipboard-dialog-export").show();
$("#red-ui-clipboard-dialog-download").show();
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 effb176e4..a67e5fccd 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
@@ -1003,11 +1003,11 @@ RED.diff = (function() {
className = "red-ui-diff-selectbox-tab-"+node.id.replace(/\./g,'-');
$("."+className+"-"+this.value).prop('checked',true);
if (this.value === 'local') {
- $("."+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");
+ $("."+className+"-"+this.value).closest(".red-ui-diff-list-node").addClass("red-ui-diff-select-local");
+ $("."+className+"-"+this.value).closest(".red-ui-diff-list-node").removeClass("red-ui-diff-select-remote");
} else {
- $("."+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");
+ $("."+className+"-"+this.value).closest(".red-ui-diff-list-node").removeClass("red-ui-diff-select-local");
+ $("."+className+"-"+this.value).closest(".red-ui-diff-list-node").addClass("red-ui-diff-select-remote");
}
} else {
// Individual node or properties table
@@ -1015,15 +1015,15 @@ RED.diff = (function() {
$('#'+parentId+"-local").prop('checked',false);
$('#'+parentId+"-remote").prop('checked',false);
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");
+ titleRowDiv.removeClass("red-ui-diff-select-local");
+ titleRowDiv.removeClass("red-ui-diff-select-remote");
}
if (this.value === 'local') {
- row.removeClass("node-diff-select-remote");
- row.addClass("node-diff-select-local");
+ row.removeClass("red-ui-diff-select-remote");
+ row.addClass("red-ui-diff-select-local");
} else if (this.value === 'remote') {
- row.addClass("node-diff-select-remote");
- row.removeClass("node-diff-select-local");
+ row.addClass("red-ui-diff-select-remote");
+ row.removeClass("red-ui-diff-select-local");
}
refreshConflictHeader(diff);
}
@@ -1058,8 +1058,8 @@ RED.diff = (function() {
$("#red-ui-diff-dialog-toolbar-resolved-conflicts").html('
'+RED._("diff.unresolvedCount",{count:conflictCount - resolutionCount}));
}
if (conflictCount === resolutionCount) {
- $("#node-diff-view-diff-merge").removeClass('disabled');
- $("#node-diff-view-resolve-diff").removeClass('disabled');
+ $("#red-ui-diff-view-diff-merge").removeClass('disabled');
+ $("#red-ui-diff-view-resolve-diff").removeClass('disabled');
}
}
function getRemoteDiff(callback) {
@@ -1264,14 +1264,14 @@ RED.diff = (function() {
var diffTable = buildDiffPanel(diffContainer,diff,options);
diffTable.list.hide();
if (remoteDiff) {
- $("#node-diff-view-diff-merge").show();
+ $("#red-ui-diff-view-diff-merge").show();
if (Object.keys(conflicts).length === 0) {
- $("#node-diff-view-diff-merge").removeClass('disabled');
+ $("#red-ui-diff-view-diff-merge").removeClass('disabled');
} else {
- $("#node-diff-view-diff-merge").addClass('disabled');
+ $("#red-ui-diff-view-diff-merge").addClass('disabled');
}
} else {
- $("#node-diff-view-diff-merge").hide();
+ $("#red-ui-diff-view-diff-merge").hide();
}
refreshConflictHeader(diff);
// console.log("--------------");
@@ -1296,11 +1296,11 @@ RED.diff = (function() {
if (options.mode === 'merge') {
trayOptions.buttons.push(
{
- id: "node-diff-view-diff-merge",
+ id: "red-ui-diff-view-diff-merge",
text: RED._("deploy.confirm.button.merge"),
class: "primary disabled",
click: function() {
- if (!$("#node-diff-view-diff-merge").hasClass('disabled')) {
+ if (!$("#red-ui-diff-view-diff-merge").hasClass('disabled')) {
refreshConflictHeader(diff);
mergeDiff(diff);
RED.tray.close();
@@ -1753,7 +1753,7 @@ RED.diff = (function() {
$('
').appendTo(content);
}
var diffRow = $('