ensure export clipboard keeps text selected and formatted

This commit is contained in:
Dave Conway-Jones 2017-02-28 21:50:06 +00:00
parent 16c92cc739
commit f5e6ca3e10
1 changed files with 7 additions and 3 deletions

View File

@ -164,6 +164,7 @@ RED.clipboard = (function() {
dialogContainer.empty(); dialogContainer.empty();
dialogContainer.append($(exportNodesDialog)); dialogContainer.append($(exportNodesDialog));
dialogContainer.i18n(); dialogContainer.i18n();
var format = RED.settings.flowFilePretty ? "export-format-full" : "export-format-mini";
$("#export-format-group > a").click(function(evt) { $("#export-format-group > a").click(function(evt) {
evt.preventDefault(); evt.preventDefault();
@ -177,15 +178,17 @@ RED.clipboard = (function() {
if (flow.length > 0) { if (flow.length > 0) {
var nodes = JSON.parse(flow); var nodes = JSON.parse(flow);
var format = $(this).attr('id'); format = $(this).attr('id');
if (format === 'export-format-full') { if (format === 'export-format-full') {
flow = JSON.stringify(nodes,null,4); flow = JSON.stringify(nodes,null,4);
} else { } else {
flow = JSON.stringify(nodes); flow = JSON.stringify(nodes);
} }
$("#clipboard-export").val(flow); $("#clipboard-export").val(flow);
$("#clipboard-export").focus();
} }
}); });
$("#export-range-group > a").click(function(evt) { $("#export-range-group > a").click(function(evt) {
evt.preventDefault(); evt.preventDefault();
if ($(this).hasClass('disabled') || $(this).hasClass('selected')) { if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
@ -209,7 +212,7 @@ RED.clipboard = (function() {
nodes = RED.nodes.createCompleteNodeSet(false); nodes = RED.nodes.createCompleteNodeSet(false);
} }
if (nodes !== null) { if (nodes !== null) {
if (RED.settings.flowFilePretty) { if (format === "export-format-full") {
flow = JSON.stringify(nodes,null,4); flow = JSON.stringify(nodes,null,4);
} else { } else {
flow = JSON.stringify(nodes); flow = JSON.stringify(nodes);
@ -221,6 +224,7 @@ RED.clipboard = (function() {
$("#export-copy").addClass('disabled'); $("#export-copy").addClass('disabled');
} }
$("#clipboard-export").val(flow); $("#clipboard-export").val(flow);
$("#clipboard-export").focus();
}) })
$("#clipboard-dialog-ok").hide(); $("#clipboard-dialog-ok").hide();
@ -234,7 +238,7 @@ RED.clipboard = (function() {
$("#export-range-selected").addClass('disabled').removeClass('selected'); $("#export-range-selected").addClass('disabled').removeClass('selected');
$("#export-range-flow").click(); $("#export-range-flow").click();
} }
if (RED.settings.flowFilePretty) { if (format === "export-format-full") {
$("#export-format-full").click(); $("#export-format-full").click();
} else { } else {
$("#export-format-mini").click(); $("#export-format-mini").click();