').text(errString);
+ var errorPos;
+ // Chrome error messages
+ var m = /at position (\d+)/i.exec(errString);
+ if (m) {
+ errorPos = parseInt(m[1]);
+ } else {
+ // Firefox error messages
+ m = /at line (\d+) column (\d+)/i.exec(errString);
+ if (m) {
+ var line = parseInt(m[1])-1;
+ var col = parseInt(m[2])-1;
+ var lines = v.split("\n");
+ errorPos = 0;
+ for (var i=0;i
').appendTo(message);
+ var code = $('').appendTo(parseError);
+ $('').text(v.substring(errorPos-12,errorPos)).appendTo(code)
+ $('').text(v.charAt(errorPos)).appendTo(code);
+ $('').text(v.substring(errorPos+1,errorPos+12)).appendTo(code);
+ }
+ popover.close(true).setContent(message).open();
+ currentPopoverError = errString;
+ }
+ } else {
+ currentPopoverError = null;
+ }
+ $("#clipboard-dialog-ok").button("disable");
+ }
+ },100);
+ } else {
+ var file = libraryBrowser.getSelected();
+ if (file && file.label && !file.children) {
+ $("#clipboard-dialog-ok").button("enable");
+ } else {
$("#clipboard-dialog-ok").button("disable");
}
- },100);
+ }
}
- function importNodes() {
+ function importNodes(mode) {
if (disabled) {
return;
}
+ mode = mode || "clipboard";
+
dialogContainer.empty();
dialogContainer.append($(importNodesDialog));
+
+ var tabs = RED.tabs.create({
+ id: "clipboard-dialog-import-tabs",
+ vertical: true,
+ onchange: function(tab) {
+ $("#clipboard-dialog-import-tabs-content").children().hide();
+ $("#" + tab.id).show();
+ activeTab = tab.id;
+ if (popover) {
+ popover.close(true);
+ currentPopoverError = null;
+ }
+ if (tab.id === "clipboard-dialog-import-tab-clipboard") {
+ $("#clipboard-import").focus();
+ }
+ validateImport();
+ }
+ });
+ tabs.addTab({
+ id: "clipboard-dialog-import-tab-clipboard",
+ label: RED._("clipboard.clipboard")
+ });
+ tabs.addTab({
+ id: "clipboard-dialog-import-tab-library",
+ label: RED._("library.library")
+ });
+
+ tabs.activateTab("clipboard-dialog-import-tab-"+mode);
+ if (mode === 'clipboard') {
+ setTimeout(function() {
+ $("#clipboard-import").focus();
+ },100)
+ }
+
+
+ $("#clipboard-dialog-tab-library-name").keyup(validateExportFilename);
+ $("#clipboard-dialog-tab-library-name").on('paste',function() { setTimeout(validateExportFilename,10)});
+ $("#clipboard-dialog-export").button("enable");
+
+ libraryBrowser = RED.library.createBrowser({
+ container: $("#clipboard-dialog-import-tab-library-browser"),
+ onselect: function(file) {
+ if (file && file.label && !file.children) {
+ $("#clipboard-dialog-ok").button("enable");
+ } else {
+ $("#clipboard-dialog-ok").button("disable");
+ }
+ }
+ })
+ loadFlowLibrary(libraryBrowser,true);
+
dialogContainer.i18n();
$("#clipboard-dialog-ok").show();
@@ -381,7 +464,7 @@ RED.clipboard = (function() {
onchange: function(tab) {
$("#clipboard-dialog-export-tabs-content").children().hide();
$("#" + tab.id).show();
- activeExportTab = tab.id;
+ activeTab = tab.id;
if (tab.id === "clipboard-dialog-export-tab-clipboard") {
$("#clipboard-dialog-export").button("option","label", RED._("clipboard.export.copy"))
$("#clipboard-dialog-download").show();
@@ -394,11 +477,11 @@ RED.clipboard = (function() {
});
tabs.addTab({
id: "clipboard-dialog-export-tab-clipboard",
- label: "Clipboard"
+ label: RED._("clipboard.clipboard")
});
tabs.addTab({
id: "clipboard-dialog-export-tab-library",
- label: "Library"
+ label: RED._("library.library")
});
tabs.activateTab("clipboard-dialog-export-tab-"+mode);
@@ -416,53 +499,10 @@ RED.clipboard = (function() {
}
}
})
+ loadFlowLibrary(libraryBrowser,false);
- function xformList(list,label,root) {
- var result = {
- icon: root===""?"fa fa-archive":'fa fa-folder',
- label: label,
- path: root
- };
- result.children = [];
-
- if (list.f) {
- list.f.forEach(function(f) {
- result.children.push({
- icon: 'fa fa-file-o',
- label: f,
- path: root+f
- });
- });
- }
- if (list.d) {
- for (var l in list.d) {
- if (list.d.hasOwnProperty(l)) {
- if (root+l !== "_examples_") {
- result.children.push(xformList(list.d[l], l,root+l+"/"))
- }
- }
- }
- }
- result.children.sort(function(A,B){
- if (A.children && !B.children) {
- return -1;
- } else if (!A.children && B.children) {
- return 1;
- } else {
- return A.label.localeCompare(B.label);
- }
- });
- return result;
- }
-
- $.getJSON("library/flows", function(data) {
- var listing = [xformList(data,"Local","")];
- listing[0].expanded = true;
- libraryBrowser.data(listing);
- });
$("#clipboard-dialog-tab-library-name").val("flows.json").select();
-
dialogContainer.i18n();
var format = RED.settings.flowFilePretty ? "export-format-full" : "export-format-mini";
@@ -569,6 +609,60 @@ RED.clipboard = (function() {
$("#clipboard-dialog-download").show();
}
+ function transformFlowList(list,label,root,includeExamples) {
+ var result = {
+ icon: root===""?"fa fa-archive":'fa fa-folder',
+ label: label,
+ path: root
+ };
+ result.children = [];
+
+ if (list.f) {
+ list.f.forEach(function(f) {
+ result.children.push({
+ icon: 'fa fa-file-o',
+ label: f,
+ path: root+f
+ });
+ });
+ }
+ if (list.d) {
+ for (var l in list.d) {
+ if (list.d.hasOwnProperty(l)) {
+ if (root+l !== "_examples_") {
+ result.children.push(transformFlowList(list.d[l], l,root+l+"/",includeExamples))
+ } else if (includeExamples) {
+ result._examples = transformFlowList(list.d[l], l,root+l+"/",includeExamples)
+ }
+ }
+ }
+ }
+ result.children.sort(function(A,B){
+ if (A.children && !B.children) {
+ return -1;
+ } else if (!A.children && B.children) {
+ return 1;
+ } else {
+ return A.label.localeCompare(B.label);
+ }
+ });
+ return result;
+ }
+
+ function loadFlowLibrary(browser,includeExamples) {
+ $.getJSON("library/flows", function(data) {
+ var listing = [transformFlowList(data,RED._("library.types.local"),"",includeExamples)];
+ listing[0].expanded = true;
+ if (includeExamples && listing[0]._examples) {
+ var examples = listing[0]._examples;
+ delete listing[0]._examples;
+ examples.label = RED._("library.types.examples");
+ examples.icon = "fa fa-archive";
+ listing.unshift(examples)
+ }
+ browser.data(listing);
+ });
+ }
function hideDropTarget() {
$("#dropTarget").hide();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
index 70054c727..925acfba4 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
@@ -121,24 +121,41 @@
container.addClass('built');
var childrenAdded = false;
var spinner;
+ var startTime = 0;
item.children(item,function(children) {
childrenAdded = true;
- item.treeList.childList = that._addChildren(container,parent,children,depth);
- if (spinner) {
- spinner.remove();
+ item.treeList.childList = that._addChildren(container,item,children,depth).hide();
+ var delta = Date.now() - startTime;
+ if (delta < 400) {
+ setTimeout(function() {
+ item.treeList.childList.slideDown('fast');
+ if (spinner) {
+ spinner.remove();
+ }
+ },400-delta);
+ } else {
+ item.treeList.childList.slideDown('fast');
+ if (spinner) {
+ spinner.remove();
+ }
}
that._trigger("childrenloaded",null,item)
});
if (!childrenAdded) {
+ startTime = Date.now();
spinner = $('').css({
"background-position": (35+depth*15)+'px 50%'
}).appendTo(container);
}
+ } else {
+ item.treeList.childList.slideDown('fast');
}
container.addClass("expanded");
+
}
item.treeList.collapse = function() {
+ item.treeList.childList.slideUp('fast');
container.removeClass("expanded");
}
@@ -181,7 +198,7 @@
}
if (item.children) {
if (Array.isArray(item.children)) {
- item.treeList.childList = that._addChildren(container,item,item.children,depth);
+ item.treeList.childList = that._addChildren(container,item,item.children,depth).hide();
}
if (item.expanded) {
item.treeList.expand();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
index 6b5af77fa..7c8b5d811 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
@@ -15,16 +15,14 @@
**/
RED.library = (function() {
- var exportToLibraryDialog;
var loadLibraryBrowser;
var saveLibraryBrowser;
var libraryEditor;
var activeLibrary;
-
var _libraryLookup = '