",{id:"red-ui-actionList",class:"red-ui-search"}).appendTo("#red-ui-main-container");
+ var searchDiv = $("
",{class:"red-ui-search-container"}).appendTo(dialog);
+ searchInput = $('').appendTo(searchDiv).searchBox({
+ change: function() {
+ filterTerm = $(this).val().trim();
+ filterTerms = filterTerm.split(" ");
+ searchResults.editableList('filter');
+ searchResults.find("li.selected").removeClass("selected");
+ var children = searchResults.children(":visible");
+ if (children.length) {
+ $(children[0]).addClass('selected');
+ }
+ }
+ });
+
+ searchInput.on('keydown',function(evt) {
+ var selectedChild;
+ if (evt.keyCode === 40) {
+ // Down
+ selectedChild = searchResults.find("li.selected");
+ if (!selectedChild.length) {
+ var children = searchResults.children(":visible");
+ if (children.length) {
+ $(children[0]).addClass('selected');
+ }
+ } else {
+ var nextChild = selectedChild.nextAll(":visible").first();
+ if (nextChild.length) {
+ selectedChild.removeClass('selected');
+ nextChild.addClass('selected');
+ }
+ }
+ ensureSelectedIsVisible();
+ evt.preventDefault();
+ } else if (evt.keyCode === 38) {
+ // Up
+ selectedChild = searchResults.find("li.selected");
+ var nextChild = selectedChild.prevAll(":visible").first();
+ if (nextChild.length) {
+ selectedChild.removeClass('selected');
+ nextChild.addClass('selected');
+ }
+ ensureSelectedIsVisible();
+ evt.preventDefault();
+ } else if (evt.keyCode === 13) {
+ // Enter
+ selectedChild = searchResults.find("li.selected");
+ selectCommand(searchResults.editableList('getItem',selectedChild));
+ }
+ });
+ searchInput.i18n();
+
+ var searchResultsDiv = $("
",{class:"red-ui-search-results-container"}).appendTo(dialog);
+ searchResults = $('
- ',{style:"position: absolute;top: 5px;bottom: 5px;left: 5px;right: 5px;"}).appendTo(searchResultsDiv).editableList({
+ addButton: false,
+ addItem: function(container,i,action) {
+ if (action.id === undefined) {
+ $('
- ');
@@ -248,7 +250,13 @@
});
}
if (!added) {
- li.appendTo(this.element);
+ if (index <= 0) {
+ li.prependTo(this.element);
+ } else if (index > that.element.children().length-1) {
+ li.appendTo(this.element);
+ } else {
+ li.insertBefore(this.element.children().eq(index));
+ }
}
var row = $('').addClass("red-ui-editableList-item-content").appendTo(li);
row.data('data',data);
@@ -293,6 +301,9 @@
},0);
}
},
+ addItem: function(data) {
+ this.insertItemAt(data,this.element.children().length)
+ },
addItems: function(items) {
for (var i=0; i
'; } else { linkContent += ' '; @@ -98,21 +98,10 @@ RED.menu = (function() { return; } if (opt.toggle) { - var selected = isSelected(opt.id); - if (typeof opt.toggle === "string") { - if (!selected) { - for (var m in menuItems) { - if (menuItems.hasOwnProperty(m)) { - var mi = menuItems[m]; - if (mi.id != opt.id && opt.toggle == mi.toggle) { - setSelected(mi.id,false); - } - } - } - setSelected(opt.id,true); - } + if (opt.toggle === true) { + setSelected(opt.id, !isSelected(opt.id)); } else { - setSelected(opt.id, !selected); + setSelected(opt.id, true); } } else { triggerAction(opt.id); @@ -209,8 +198,9 @@ RED.menu = (function() { } function setSelected(id,state) { + var alreadySet = false; if (isSelected(id) == state) { - return; + alreadySet = true; } var opt = menuItems[id]; if (state) { @@ -218,10 +208,26 @@ RED.menu = (function() { } else { $("#"+id).removeClass("active"); } - if (opt && opt.onselect) { - triggerAction(opt.id,state); + if (opt) { + if (opt.toggle && typeof opt.toggle === "string") { + if (state) { + for (var m in menuItems) { + if (menuItems.hasOwnProperty(m)) { + var mi = menuItems[m]; + if (mi.id != opt.id && opt.toggle == mi.toggle) { + setSelected(mi.id,false); + } + } + } + } + } + if (!alreadySet && opt.onselect) { + triggerAction(opt.id,state); + } + } + if (!alreadySet) { + RED.settings.set(opt.setting||("menu-"+opt.id), state); } - RED.settings.set(opt.setting||("menu-"+opt.id), state); } function toggleSelected(id) { diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js index 5a1c8718c..00fc0d435 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js @@ -52,6 +52,11 @@ RED.popover = (function() { var openPopup = function(instant) { if (active) { + var existingPopover = target.data("red-ui-popover"); + if (options.tooltip && existingPopover) { + active = false; + return; + } div = $(''); if (size !== "default") { div.addClass("red-ui-popover-size-"+size); @@ -122,7 +127,10 @@ RED.popover = (function() { } } div.addClass('red-ui-popover-'+d).css({top: top, left: left}); - + if (existingPopover) { + existingPopover.close(true); + } + target.data("red-ui-popover",res) if (instant) { div.show(); } else { @@ -142,6 +150,7 @@ RED.popover = (function() { }); } div = null; + target.removeData("red-ui-popover",res) } } } @@ -236,6 +245,7 @@ RED.popover = (function() { } } return RED.popover.create({ + tooltip: true, target:target, trigger: "hover", size: "small", diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js index 3f3aa87f1..214668485 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js @@ -87,6 +87,7 @@ that._trigger("change"); },this.options.delay); } else { + this.lastSent = this.element.val(); this._trigger("change"); } } diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js new file mode 100644 index 000000000..999606912 --- /dev/null +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js @@ -0,0 +1,100 @@ +/** + * Copyright JS Foundation and other contributors, http://js.foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + **/ +(function($) { + +/** + * options: + * - invertState : boolean - if "true" the button will show "enabled" when the + * checkbox is not selected and vice versa. + * - enabledIcon : string - the icon for "enabled" state, default "fa-check-square-o" + * - enabledLabel : string - the label for "enabled" state, default "Enabled" ("editor:workspace.enabled") + * - disabledIcon : string - the icon for "disabled" state, default "fa-square-o" + * - disabledLabel : string - the label for "disabled" state, default "Disabled" ("editor:workspace.disabled") + * - baseClass : string - the base css class to apply, default "red-ui-button" (alternative eg "red-ui-sidebar-header-button") + * - class : string - additional classes to apply to the button - eg "red-ui-button-small" + * methods: + * - + */ + $.widget( "nodered.toggleButton", { + _create: function() { + var that = this; + + var invertState = false; + if (this.options.hasOwnProperty("invertState")) { + invertState = this.options.invertState; + } + var baseClass = this.options.baseClass || "red-ui-button"; + var enabledIcon = this.options.enabledIcon || "fa-check-square-o"; + var disabledIcon = this.options.disabledIcon || "fa-square-o"; + var enabledLabel = this.options.enabledLabel || RED._("editor:workspace.enabled"); + var disabledLabel = this.options.disabledLabel || RED._("editor:workspace.disabled"); + + this.element.css("display","none"); + this.element.on("focus", function() { + that.button.focus(); + }); + this.button = $(''); + if (this.options.class) { + this.button.addClass(this.options.class) + } + this.element.after(this.button); + this.buttonIcon = this.button.find("i"); + this.buttonLabel = this.button.find("span"); + + // Quick hack to find the maximum width of the button + this.button.addClass("selected"); + this.buttonIcon.addClass(enabledIcon); + this.buttonLabel.text(enabledLabel); + var width = this.button.width(); + this.button.removeClass("selected"); + this.buttonIcon.removeClass(enabledIcon); + that.buttonIcon.addClass(disabledIcon); + that.buttonLabel.text(disabledLabel); + width = Math.max(width,this.button.width()); + this.buttonIcon.removeClass(disabledIcon); + + // Fix the width of the button so it doesn't jump around when toggled + if (width > 0) { + this.button.width(Math.ceil(width)); + } + + this.button.on("click",function(e) { + e.stopPropagation(); + if (that.buttonIcon.hasClass(disabledIcon)) { + that.element.prop("checked",!invertState); + } else { + that.element.prop("checked",invertState); + } + that.element.trigger("change"); + }) + + this.element.on("change", function(e) { + if ($(this).prop("checked") !== invertState) { + that.button.addClass("selected"); + that.buttonIcon.addClass(enabledIcon); + that.buttonIcon.removeClass(disabledIcon); + that.buttonLabel.text(enabledLabel); + } else { + that.button.removeClass("selected"); + that.buttonIcon.addClass(disabledIcon); + that.buttonIcon.removeClass(enabledIcon); + that.buttonLabel.text(disabledLabel); + } + }) + this.element.trigger("change"); + } + }); +})(jQuery); 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 ef7b4dd54..0e391a5b8 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 @@ -18,32 +18,70 @@ /** * options: * - data : array - initial items to display in tree + * - multi : boolean - if true, .selected will return an array of results + * otherwise, returns the first selected item + * - sortable: boolean/string - TODO: see editableList + * - rootSortable: boolean - if 'sortable' is set, then setting this to + * false, prevents items being sorted to the + * top level of the tree * * methods: * - data(items) - clears existing items and replaces with new data * * events: * - treelistselect : function(event, item) {} - * + * - treelistconfirm : function(event,item) {} + * - treelistchangeparent: function(event,item, oldParent, newParent) {} * * data: * [ * { * label: 'Local', // label for the item + * sublabel: 'Local', // a sub-label for the item * icon: 'fa fa-rocket', // (optional) icon for the item * selected: true/false, // (optional) if present, display checkbox accordingly - * children: [] | function(item,done) // (optional) an array of child items, or a function + * children: [] | function(done,item) // (optional) an array of child items, or a function * // that will call the `done` callback with an array * // of child items + * expanded: true/false, // show the child items by default + * deferBuild: true/false, // don't build any ui elements for the item's children + * until it is expanded by the user. + * element: // custom dom element to use for the item - ignored if `label` is set * } * ] * - * - * * var treeList = $("
").css({width: "100%", height: "100%"}).treeList({data:[...]}) * treeList.on('treelistselect', function(e,item) { console.log(item)}) * treeList.treeList('data',[ ... ] ) * + * + * After `data` has been added to the tree, each item is augmented the following + * properties and functions: + * + * item.parent - set to the parent item + * item.treeList.container + * item.treeList.label - the label element for the item + * item.treeList.depth - the depth in the tree (0 == root) + * item.treeList.parentList - the editableList instance this item is in + * item.treeList.remove() - removes the item from the tree + * item.treeList.makeLeaf(detachChildElements) - turns an element with children into a leaf node, + * removing the UI decoration etc. + * detachChildElements - any children with custom + * elements will be detached rather than removed + * so jQuery event handlers are preserved in case + * the child elements need to be reattached later + * item.treeList.makeParent(children) - turns an element into a parent node, adding the necessary + * UI decoration. + * item.treeList.insertChildAt(newItem,position,select) - adds a child item an the specified position. + * Optionally selects the item after adding. + * item.treeList.addChild(newItem,select) - appends a child item. + * Optionally selects the item after adding. + * item.treeList.expand(done) - expands the parent item to show children. Optional 'done' callback. + * item.treeList.collapse() - collapse the parent item to hide children. + * + * + * + * */ $.widget( "nodered.treeList", { @@ -61,6 +99,18 @@ } var target; switch(evt.keyCode) { + case 13: // ENTER + if (selected.children) { + if (selected.treeList.container.hasClass("expanded")) { + selected.treeList.collapse() + } else { + selected.treeList.expand() + } + } else { + that._trigger("confirm",null,selected) + } + + break; case 37: // LEFT if (selected.children&& selected.treeList.container.hasClass("expanded")) { selected.treeList.collapse() @@ -102,20 +152,30 @@ }); this._data = []; - this._topList = $('- ').css({
+ this._topList = $('
- '+
''+
''+
- '
'+
+ '
'+
''+RED._("deploy.deploy")+''+
''+
' ').prependTo(".red-ui-header-toolbar");
RED.menu.init({id:"red-ui-header-button-deploy-options",
options: [
- {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.png",label:RED._("deploy.full"),sublabel:RED._("deploy.fullDesc"),selected: true, onselect:function(s) { if(s){changeDeploymentType("full")}}},
- {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.png",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
- {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.png",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
+ {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.svg",label:RED._("deploy.full"),sublabel:RED._("deploy.fullDesc"),selected: true, onselect:function(s) { if(s){changeDeploymentType("full")}}},
+ {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.svg",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
+ {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.svg",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
null,
- {id:"deploymenu-item-reload", icon:"red/images/deploy-reload.png",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"},
+ {id:"deploymenu-item-reload", icon:"red/images/deploy-reload.svg",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"},
]
});
} else if (type == "simple") {
var label = options.label || RED._("deploy.deploy");
- var icon = 'red/images/deploy-full-o.png';
+ var icon = 'red/images/deploy-full-o.svg';
if (options.hasOwnProperty('icon')) {
icon = options.icon;
}
@@ -99,7 +99,13 @@ RED.deploy = (function() {
});
RED.actions.add("core:deploy-flows",save);
- RED.actions.add("core:restart-flows",restart);
+ if (type === "default") {
+ RED.actions.add("core:restart-flows",restart);
+ RED.actions.add("core:set-deploy-type-to-full",function() { RED.menu.setSelected("deploymenu-item-full",true);});
+ RED.actions.add("core:set-deploy-type-to-modified-flows",function() { RED.menu.setSelected("deploymenu-item-flow",true); });
+ RED.actions.add("core:set-deploy-type-to-modified-nodes",function() { RED.menu.setSelected("deploymenu-item-node",true); });
+ }
+
RED.events.on('nodes:change',function(state) {
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 9ea599e3d..4ebdcdce9 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
@@ -399,7 +399,7 @@ RED.diff = (function() {
diff: localDiff,
def: {
defaults:{},
- icon:"subflow.png",
+ icon:"subflow.svg",
category: "subflows",
color: "#da9"
},
@@ -422,7 +422,7 @@ RED.diff = (function() {
diff: localDiff,
def: {
defaults:{},
- icon:"subflow.png",
+ icon:"subflow.svg",
category: "subflows",
color: "#da9"
},
@@ -443,7 +443,7 @@ RED.diff = (function() {
remoteDiff: remoteDiff,
def: {
defaults:{},
- icon:"subflow.png",
+ icon:"subflow.svg",
category: "subflows",
color: "#da9"
},
@@ -549,7 +549,7 @@ RED.diff = (function() {
if (def === undefined) {
if (/^subflow:/.test(node.type)) {
def = {
- icon:"subflow.png",
+ icon:"subflow.svg",
category: "subflows",
color: "#da9",
defaults:{name:{value:""}}
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index fe506c0e3..4547dc756 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -513,6 +513,8 @@ RED.editor = (function() {
label = RED._("expressionEditor.title");
} else if (node.type === '_js') {
label = RED._("jsEditor.title");
+ } else if (node.type === '_text') {
+ label = RED._("textEditor.title");
} else if (node.type === '_json') {
label = RED._("jsonEditor.title");
} else if (node.type === '_markdown') {
@@ -565,13 +567,13 @@ RED.editor = (function() {
type: "text",
style: "margin-left: 5px; width: calc(40% - 8px)",
placeholder: RED._("common.label.name")
- }).appendTo(row).val(opt.name);
+ }).attr("autocomplete","disable").appendTo(row).val(opt.name);
}
var valueField = $('',{
class: "node-input-env-value",
type: "text",
style: "margin-left: 5px; width: calc(60% - 8px)"
- }).appendTo(row)
+ }).attr("autocomplete","disable").appendTo(row)
valueField.typedInput({default:'str',
types:['str','num','bool','json','bin','env']
@@ -665,17 +667,19 @@ RED.editor = (function() {
list.each(function(i) {
var entry = $(this);
var item = entry.data('data');
- var name = item.parent?item.name:entry.find(".node-input-env-name").val();
- var valueInput = entry.find(".node-input-env-value");
- var value = valueInput.typedInput("value");
- var type = valueInput.typedInput("type");
- if (!item.parent || (item.parent.value !== value || item.parent.type !== type)) {
- var item = {
- name: name,
- type: type,
- value: value
- };
- env.push(item);
+ var name = (item.parent?item.name:entry.find(".node-input-env-name").val()).trim();
+ if (name !== "") {
+ var valueInput = entry.find(".node-input-env-value");
+ var value = valueInput.typedInput("value");
+ var type = valueInput.typedInput("type");
+ if (!item.parent || (item.parent.value !== value || item.parent.type !== type)) {
+ var item = {
+ name: name,
+ type: type,
+ value: value
+ };
+ env.push(item);
+ }
}
});
return env;
@@ -719,6 +723,7 @@ RED.editor = (function() {
$('').prependTo(dialogForm);
$('').prependTo(dialogForm);
dialogForm.on("submit", function(e) { e.preventDefault();});
+ dialogForm.find('input').attr("autocomplete","disable");
return dialogForm;
}
@@ -950,34 +955,19 @@ RED.editor = (function() {
$('
- ').css({
position:'absolute',
top: 0,
left:0,
right:0,
bottom:0
- }).appendTo(wrapper).editableList({
+ }).appendTo(wrapper);
+
+ var topListOptions = {
addButton: false,
scrollOnAdd: false,
height: '100%',
addItem: function(container,i,item) {
that._addSubtree(that._topList,container,item,0);
}
- })
+ };
+ if (this.options.rootSortable !== false && !!this.options.sortable) {
+ topListOptions.sortable = this.options.sortable;
+ topListOptions.connectWith = '.red-ui-treeList-sortable';
+ this._topList.addClass('red-ui-treeList-sortable');
+ }
+ this._topList.editableList(topListOptions)
+
+
if (this.options.data) {
this.data(this.options.data);
}
@@ -157,23 +217,82 @@
},
_addChildren: function(container,parent,children,depth) {
var that = this;
- var subtree = $('
- ').appendTo(container).editableList({
+ var subtree = $('
- ').appendTo(container).editableList({
+ connectWith: ".red-ui-treeList-sortable",
+ sortable: that.options.sortable,
addButton: false,
scrollOnAdd: false,
height: 'auto',
addItem: function(container,i,item) {
that._addSubtree(subtree,container,item,depth+1);
+ },
+ sortItems: function(data) {
+ var children = [];
+ var reparented = [];
+ data.each(function() {
+ var child = $(this).data('data');
+ children.push(child);
+ var evt = that._fixDepths(parent,child);
+ if (evt) {
+ reparented.push(evt);
+ }
+ })
+ if (Array.isArray(parent.children)) {
+ parent.children = children;
+ }
+ reparented.forEach(function(evt) {
+ that._trigger("changeparent",null,evt);
+ });
+ that._trigger("sort",null,parent);
}
});
+ if (!!that.options.sortable) {
+ subtree.addClass('red-ui-treeList-sortable');
+ }
for (var i=0;i
').css({ - "background-position": (35+depth*15)+'px 50%' - }).appendTo(container); + if (child.gutter) { + child.gutter.detach(); + } + detachChildren(child); + }); } - - } else { - item.treeList.childList.slideDown('fast'); - done && done(); } - container.addClass("expanded"); + detachChildren(item); } - item.treeList.collapse = function() { - item.treeList.childList.slideUp('fast'); - container.removeClass("expanded"); + treeListIcon.empty(); + if (!item.deferBuild) { + item.treeList.childList.remove(); + delete item.treeList.childList; } - - $('').appendTo(label); + label.off("click.red-ui-treeList-expand"); + treeListIcon.off("click.red-ui-treeList-expand"); + delete item.children; + container.removeClass("expanded"); + } + item.treeList.makeParent = function(children) { + if (treeListIcon.children().length) { + // Already a parent because we've got the angle-right icon + return; + } + $('').appendTo(treeListIcon); + treeListIcon.on("click.red-ui-treeList-expand", function(e) { + e.stopPropagation(); + e.preventDefault(); + if (container.hasClass("expanded")) { + item.treeList.collapse(); + } else { + item.treeList.expand(); + } + }); // $('').appendTo(label); - label.on("click", function(e) { + label.on("click.red-ui-treeList-expand", function(e) { if (container.hasClass("expanded")) { if (item.hasOwnProperty('selected') || label.hasClass("selected")) { item.treeList.collapse(); @@ -271,36 +383,151 @@ item.treeList.expand(); } }) - } else { - $('').appendTo(label); + if (!item.children) { + item.children = children||[]; + item.treeList.childList = that._addChildren(container,item,item.children,depth).hide(); + } } + item.treeList.insertChildAt = function(newItem,position,select) { + newItem.parent = item; + item.children.splice(position,0,newItem); + + if (!item.deferBuild) { + item.treeList.childList.editableList('insertItemAt',newItem,position) + if (select) { + setTimeout(function() { + that.select(newItem) + },100); + } + that._trigger("sort",null,item); + } + } + item.treeList.addChild = function(newItem,select) { + item.treeList.insertChildAt(newItem,item.children.length,select); + } + item.treeList.expand = function(done) { + if (!item.children) { + return; + } + if (container.hasClass("expanded")) { + done && done(); + return; + } + if (!container.hasClass("built") && (item.deferBuild || typeof item.children === 'function')) { + container.addClass('built'); + var childrenAdded = false; + var spinner; + var startTime = 0; + var completeBuild = function(children) { + childrenAdded = true; + 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(); + } + } + done && done(); + that._trigger("childrenloaded",null,item) + } + if (typeof item.children === 'function') { + item.children(completeBuild,item); + } else { + delete item.deferBuild; + completeBuild(item.children); + } + if (!childrenAdded) { + startTime = Date.now(); + spinner = $('').css({ + "background-position": (35+depth*20)+'px 50%' + }).appendTo(container); + } + + } else { + if (that._loadingData) { + item.treeList.childList.show(); + } else { + item.treeList.childList.slideDown('fast'); + } + done && done(); + } + container.addClass("expanded"); + } + item.treeList.collapse = function() { + if (!item.children) { + return; + } + item.treeList.childList.slideUp('fast'); + container.removeClass("expanded"); + } + + var treeListIcon = $('').appendTo(label); + if (item.children) { + item.treeList.makeParent(); + } + if (item.hasOwnProperty('selected')) { var selectWrapper = $('').appendTo(label); var cb = $('').prop('checked',item.selected).appendTo(selectWrapper); + label.toggleClass("selected",item.selected); cb.on('click', function(e) { e.stopPropagation(); }); cb.on('change', function(e) { item.selected = this.checked; + label.toggleClass("selected",this.checked); that._trigger("select",e,item); }) + if (!item.children) { + label.on("click", function(e) { + e.stopPropagation(); + cb.trigger("click"); + }) + } + item.treeList.select = function(v) { + if (v !== item.selected) { + cb.trigger("click"); + } + } } else { label.on("click", function(e) { that._topList.find(".selected").removeClass("selected"); label.addClass("selected"); that._trigger("select",e,item) }) + label.on("dblclick", function(e) { + if (!item.children) { + that._trigger("confirm",e,item); + } + }) } if (item.icon) { $('').appendTo(label); } - if (item.label) { - $('').text(item.label).appendTo(label); + if (item.hasOwnProperty('label') || item.hasOwnProperty('sublabel')) { + if (item.hasOwnProperty('label')) { + $('').text(item.label).appendTo(label); + } + if (item.hasOwnProperty('sublabel')) { + $('').text(item.sublabel).appendTo(label); + } + } else if (item.element) { $(item.element).appendTo(label); + $(item.element).css({ + width: "calc(100% - "+(labelPaddingWidth+20+(item.icon?20:0))+"px)" + }) } if (item.children) { - if (Array.isArray(item.children)) { + if (Array.isArray(item.children) && !item.deferBuild) { item.treeList.childList = that._addChildren(container,item,item.children,depth).hide(); } if (item.expanded) { @@ -312,12 +539,17 @@ this._topList.editableList('empty'); }, data: function(items) { + var that = this; if (items !== undefined) { this._data = items; this._topList.editableList('empty'); + this._loadingData = true; for (var i=0; i').appendTo(this.uiSelect) + this.types(this.options.types); if (this.options.typeField) { @@ -198,9 +255,15 @@ that.validate(); that.element.val(that.value()); that.element.trigger('change',that.propertyType,that.value()); + }); + this.input.on('keydown', function(evt) { + if (evt.keyCode >= 37 && evt.keyCode <= 40) { + evt.stopPropagation(); + } }) this.selectTrigger.on("click", function(event) { event.preventDefault(); + event.stopPropagation(); that._showTypeMenu(); }); this.selectTrigger.on('keydown',function(evt) { @@ -208,6 +271,7 @@ // Down that._showTypeMenu(); } + evt.stopPropagation(); }).on('focus', function() { that.uiSelect.addClass('red-ui-typedInput-focus'); }) @@ -220,12 +284,14 @@ }); this.optionSelectTrigger.on("click", function(event) { event.preventDefault(); + event.stopPropagation(); that._showOptionSelectMenu(); }).on('keydown', function(evt) { if (evt.keyCode === 40) { // Down that._showOptionSelectMenu(); } + evt.stopPropagation(); }).on('blur', function() { that.uiSelect.removeClass('red-ui-typedInput-focus'); }).on('focus', function() { @@ -293,7 +359,7 @@ if (opt.icon.indexOf("<") === 0) { $(opt.icon).prependTo(op); } else if (opt.icon.indexOf("/") !== -1) { - $('',{src:opt.icon,style:"margin-right: 4px; height: 18px;"}).prependTo(op); + $('
',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px; height: 18px;"}).prependTo(op); } else { $('',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(op); } @@ -306,6 +372,7 @@ op.on("click", function(event) { event.preventDefault(); + event.stopPropagation(); callback(opt.value); that._hideMenu(menu); }); @@ -325,9 +392,11 @@ // UP $(this).children(":focus").prev().trigger("focus"); } else if (evt.keyCode === 27) { + // ESCAPE evt.preventDefault(); that._hideMenu(menu); } + evt.stopPropagation(); }) @@ -370,20 +439,27 @@ }) }); }, - _getLabelWidth: function(label) { + _getLabelWidth: function(label, done) { var labelWidth = label.outerWidth(); if (labelWidth === 0) { - var container = $('').css({ + var wrapper = $('').css({ position:"absolute", - top:0 + "white-space": "nowrap", + top:-2000 }).appendTo(document.body); + var container = $('').appendTo(wrapper); var newTrigger = label.clone().appendTo(container); - labelWidth = newTrigger.outerWidth(); - container.remove(); + setTimeout(function() { + labelWidth = newTrigger.outerWidth(); + wrapper.remove(); + done(labelWidth); + },50) + } else { + done(labelWidth); } - return labelWidth; }, _resize: function() { + var that = this; if (this.uiWidth !== null) { this.uiSelect.width(this.uiWidth); } @@ -392,44 +468,44 @@ this.selectTrigger.addClass("red-ui-typedInput-full-width"); } else { this.selectTrigger.removeClass("red-ui-typedInput-full-width"); - var labelWidth = this._getLabelWidth(this.selectTrigger); - this.elementDiv.css('left',labelWidth+"px"); - if (this.optionExpandButton.is(":visible")) { - this.elementDiv.css('right',"22px"); - } else { - this.elementDiv.css('right','0'); - this.input.css({ - 'border-top-right-radius': '4px', - 'border-bottom-right-radius': '4px' - }); - } - - // if (this.optionSelectTrigger) { - // this.optionSelectTrigger.css({'left':(labelWidth)+"px",'width':'calc( 100% - '+labelWidth+'px )'}); - // } - - if (this.optionSelectTrigger) { - if (type && type.options && type.hasValue === true) { - this.optionSelectLabel.css({'left':'auto'}) - var lw = this._getLabelWidth(this.optionSelectLabel); - this.optionSelectTrigger.css({'width':(23+lw)+"px"}); - this.elementDiv.css('right',(23+lw)+"px"); - this.input.css({ - 'border-top-right-radius': 0, - 'border-bottom-right-radius': 0 - }); + this._getLabelWidth(this.selectTrigger, function(labelWidth) { + that.elementDiv.css('left',labelWidth+"px"); + that.valueLabelContainer.css('left',labelWidth+"px"); + if (that.optionExpandButton.is(":visible")) { + that.elementDiv.css('right',"22px"); + that.valueLabelContainer.css('right',"22px"); } else { - this.optionSelectLabel.css({'left':'0'}) - this.optionSelectTrigger.css({'width':'calc( 100% - '+labelWidth+'px )'}); - if (!this.optionExpandButton.is(":visible")) { - this.elementDiv.css({'right':0}); - this.input.css({ - 'border-top-right-radius': '4px', - 'border-bottom-right-radius': '4px' + that.elementDiv.css('right','0'); + that.valueLabelContainer.css('right','0'); + that.input.css({ + 'border-top-right-radius': '4px', + 'border-bottom-right-radius': '4px' + }); + } + if (that.optionSelectTrigger) { + if (type && type.options && type.hasValue === true) { + that.optionSelectLabel.css({'left':'auto'}) + that._getLabelWidth(that.optionSelectLabel, function(lw) { + that.optionSelectTrigger.css({'width':(23+lw)+"px"}); + that.elementDiv.css('right',(23+lw)+"px"); + that.input.css({ + 'border-top-right-radius': 0, + 'border-bottom-right-radius': 0 + }); }); + } else { + that.optionSelectLabel.css({'left':'0'}) + that.optionSelectTrigger.css({'width':'calc( 100% - '+labelWidth+'px )'}); + if (!that.optionExpandButton.is(":visible")) { + that.elementDiv.css({'right':0}); + that.input.css({ + 'border-top-right-radius': '4px', + 'border-bottom-right-radius': '4px' + }); + } } } - } + }); } }, _updateOptionSelectLabel: function(o) { @@ -440,7 +516,7 @@ $(o.icon).prependTo(this.optionSelectLabel); } else if (o.icon.indexOf("/") !== -1) { // url - $('
',{src:o.icon,style:"height: 18px;"}).prependTo(this.optionSelectLabel); + $('
',{src:mapDeprecatedIcon(o.icon),style:"height: 18px;"}).prependTo(this.optionSelectLabel); } else { // icon class $('',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel); @@ -461,6 +537,7 @@ this.optionMenu.remove(); } this.menu.remove(); + this.uiSelect.remove(); }, types: function(types) { var that = this; @@ -519,9 +596,15 @@ if (!selectedOption) { selectedOption = {value:""} } + this.input.val(value); this._updateOptionSelectLabel(selectedOption) + } else { + this.input.val(value); + } + if (this.typeMap[this.propertyType].valueLabel) { + this.valueLabelContainer.empty(); + this.typeMap[this.propertyType].valueLabel.call(this,this.valueLabelContainer,value); } - this.input.val(value); this.input.trigger('change',this.type(),value); } }, @@ -544,9 +627,11 @@ } else if (opt.icon.indexOf("/") !== -1) { image = new Image(); + image.onload = function() { that._resize(); } + image.onerror = function() { that._resize(); } image.name = opt.icon; - image.src = opt.icon; - $('
',{src:opt.icon,style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel); + image.src = mapDeprecatedIcon(opt.icon); + $('
',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel); } else { $('',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(this.selectLabel); @@ -566,8 +651,10 @@ this.optionSelectTrigger.show(); if (!opt.hasValue) { this.elementDiv.hide(); + this.valueLabelContainer.hide(); } else { this.elementDiv.show(); + this.valueLabelContainer.hide(); } this.activeOptions = {}; opt.options.forEach(function(o) { @@ -647,6 +734,7 @@ } } } + this.input.trigger('change',this.propertyType,this.value()); } else { if (this.optionSelectTrigger) { this.optionSelectTrigger.hide(); @@ -655,11 +743,18 @@ this.oldValue = this.input.val(); this.input.val(""); this.elementDiv.hide(); + this.valueLabelContainer.hide(); + } else if (opt.valueLabel) { + this.valueLabelContainer.show(); + this.valueLabelContainer.empty(); + opt.valueLabel.call(this,this.valueLabelContainer,this.input.val()); + this.elementDiv.hide(); } else { if (this.oldValue !== undefined) { this.input.val(this.oldValue); delete this.oldValue; } + this.valueLabelContainer.hide(); this.elementDiv.show(); } if (this.optionExpandButton) { @@ -676,10 +771,7 @@ } this.input.trigger('change',this.propertyType,this.value()); } - if (image) { - image.onload = function() { that._resize(); } - image.onerror = function() { that._resize(); } - } else { + if (!image) { this._resize(); } } 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 833e8f293..cdf84d02f 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 @@ -17,9 +17,9 @@ RED.deploy = (function() { var deploymentTypes = { - "full":{img:"red/images/deploy-full-o.png"}, - "nodes":{img:"red/images/deploy-nodes-o.png"}, - "flows":{img:"red/images/deploy-flows-o.png"} + "full":{img:"red/images/deploy-full-o.svg"}, + "nodes":{img:"red/images/deploy-nodes-o.svg"}, + "flows":{img:"red/images/deploy-flows-o.svg"} } var ignoreDeployWarnings = { @@ -44,7 +44,7 @@ RED.deploy = (function() { * type: "default" - Button with drop-down options - no further customisation available * type: "simple" - Button without dropdown. Customisations: * label: the text to display - default: "Deploy" - * icon : the icon to use. Null removes the icon. default: "red/images/deploy-full-o.png" + * icon : the icon to use. Null removes the icon. default: "red/images/deploy-full-o.svg" */ function init(options) { options = options || {}; @@ -54,7 +54,7 @@ RED.deploy = (function() { $('
'+ ''+ - ' '+ - ''+ + ''+ '').appendTo(dialogForm); - var setToggleState = function(state) { - var i = $("#node-input-show-label-btn-i"); - if (!state) { - i.addClass('fa-toggle-off'); - i.removeClass('fa-toggle-on'); - $("#node-input-show-label").prop("checked",false); - $("#node-input-show-label-label").text(RED._("editor.hide")); - } else { - i.addClass('fa-toggle-on'); - i.removeClass('fa-toggle-off'); - $("#node-input-show-label").prop("checked",true); - $("#node-input-show-label-label").text(RED._("editor.show")); - } - } - dialogForm.find('#node-input-show-label-btn').on("click",function(e) { - e.preventDefault(); - var i = $("#node-input-show-label-btn-i"); - setToggleState(i.hasClass('fa-toggle-off')); + $("#node-input-show-label").toggleButton({ + enabledLabel: RED._("editor.show"), + disabledLabel: RED._("editor.hide") }) + if (!node.hasOwnProperty("l")) { // Show label if type not link node.l = !/^link (in|out)$/.test(node._def.type); } - setToggleState(node.l); + $("#node-input-show-label").prop("checked",node.l).trigger("change"); // If a node has icon property in defaults, the icon of the node cannot be modified. (e.g, ui_button node in dashboard) if ((!node._def.defaults || !node._def.defaults.hasOwnProperty("icon"))) { @@ -1066,7 +1056,7 @@ RED.editor = (function() { hasNonBlankLabel = false; newValue = new Array(editing_node.outputs); outputLabels.each(function() { - var index = $(this).attr('id').substring(23); // red-ui-editor-node-label-form-output-+ var index = $(this).attr('id').substring("red-ui-editor-node-label-form-output-".length); if (outputMap && outputMap.hasOwnProperty(index)) { index = parseInt(outputMap[index]); if (index === -1) { @@ -1391,6 +1381,20 @@ RED.editor = (function() { node.l = true; } } + if ($("#node-input-node-disabled").prop('checked')) { + if (node.d !== true) { + changes.d = node.d; + changed = true; + node.d = true; + } + } else { + if (node.d === true) { + changes.d = node.d; + changed = true; + delete node.d; + } + } + node.resize = true; var oldInfo = node.info; @@ -1493,6 +1497,14 @@ RED.editor = (function() { var trayBody = tray.find('.red-ui-tray-body'); trayBody.parent().css('overflow','hidden'); + var trayFooterLeft = $('').appendTo(trayFooter) + + $('').prop("checked",!!node.d).appendTo(trayFooterLeft).toggleButton({ + enabledIcon: "fa-circle-thin", + disabledIcon: "fa-ban", + invertState: true + }) + var editorTabEl = $(' - '+
''+
''+
- '
',{class:"red-ui-search-empty"}).text(RED._('search.empty')).appendTo(container);
+ } else {
+ var div = $('',{href:'#',class:"red-ui-search-result"}).appendTo(container);
+ var contentDiv = $('
',{class:"red-ui-search-result-action"}).appendTo(div);
+
+
+ $('
').text(action.label).appendTo(contentDiv);
+ // $('
'+
'',{class:"red-ui-search-result-node-type"}).text(node.type).appendTo(contentDiv);
+ // $('
'+
'',{class:"red-ui-search-result-node-id"}).text(node.id).appendTo(contentDiv);
+ if (action.key) {
+ $('
'+
- '',{class:"red-ui-search-result-action-key"}).html(RED.keyboard.formatKey(action.key)).appendTo(contentDiv);
+ }
+ div.on("click", function(evt) {
+ evt.preventDefault();
+ selectCommand(action);
+ });
+ }
+ },
+ scrollOnAdd: false,
+ filter: function(item) {
+ if (filterTerm !== "") {
+ var pos=0;
+ for (var i=0;i -1) {
+ pos = j;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
+ return true;
+ }
+ });
+
+ }
+
+ function selectCommand(command) {
+ hide();
+ if (command) {
+ RED.actions.invoke(command.id);
+ }
+ }
+
+ function show(v) {
+ if (disabled) {
+ return;
+ }
+ if (!visible) {
+ previousActiveElement = document.activeElement;
+ RED.keyboard.add("*","escape",function(){hide()});
+ $("#red-ui-header-shade").show();
+ $("#red-ui-editor-shade").show();
+ $("#red-ui-palette-shade").show();
+ $("#red-ui-sidebar-shade").show();
+ $("#red-ui-sidebar-separator").hide();
+ if (dialog === null) {
+ createDialog();
+ }
+ dialog.slideDown(300);
+ searchInput.searchBox('value',v)
+ searchResults.editableList('empty');
+ results = [];
+ var actions = RED.actions.list();
+ actions.sort(function(A,B) {
+ return A.id.localeCompare(B.id);
+ });
+ actions.forEach(function(action) {
+ action.label = action.id.replace(/:/,": ").replace(/-/g," ").replace(/(^| )./g,function() { return arguments[0].toUpperCase()});
+ action._label = action.label.toLowerCase();
+ searchResults.editableList('addItem',action)
+ })
+ RED.events.emit("actionList:open");
+ visible = true;
+ }
+ searchInput.trigger("focus");
+ var children = searchResults.children(":visible");
+ if (children.length) {
+ $(children[0]).addClass('selected');
+ }
+ }
+
+ function hide() {
+ if (visible) {
+ RED.keyboard.remove("escape");
+ visible = false;
+ $("#red-ui-header-shade").hide();
+ $("#red-ui-editor-shade").hide();
+ $("#red-ui-palette-shade").hide();
+ $("#red-ui-sidebar-shade").hide();
+ $("#red-ui-sidebar-separator").show();
+ if (dialog !== null) {
+ dialog.slideUp(200,function() {
+ searchInput.searchBox('value','');
+ });
+ }
+ RED.events.emit("actionList:close");
+ if (previousActiveElement) {
+ $(previousActiveElement).trigger("focus");
+ previousActiveElement = null;
+ }
+ }
+ }
+
+ function init() {
+ RED.actions.add("core:show-action-list",show);
+
+ RED.events.on("editor:open",function() { disabled = true; });
+ RED.events.on("editor:close",function() { disabled = false; });
+ RED.events.on("search:open",function() { disabled = true; });
+ RED.events.on("search:close",function() { disabled = false; });
+ RED.events.on("type-search:open",function() { disabled = true; });
+ RED.events.on("type-search:close",function() { disabled = false; });
+
+ $("#red-ui-header-shade").on('mousedown',hide);
+ $("#red-ui-editor-shade").on('mousedown',hide);
+ $("#red-ui-palette-shade").on('mousedown',hide);
+ $("#red-ui-sidebar-shade").on('mousedown',hide);
+ }
+
+ return {
+ init: init,
+ show: show,
+ hide: hide
+ };
+
+})();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
index 0d16a7c42..cdff62919 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
@@ -26,6 +26,7 @@ RED.clipboard = (function() {
var currentPopoverError;
var activeTab;
var libraryBrowser;
+ var examplesBrowser;
function setupDialogs() {
dialog = $('')
@@ -58,7 +59,7 @@ RED.clipboard = (function() {
element.setAttribute('download', "flows.json");
element.style.display = 'none';
document.body.appendChild(element);
- element.trigger("click");
+ element.click();
document.body.removeChild(element);
$( this ).dialog( "close" );
}
@@ -139,10 +140,15 @@ RED.clipboard = (function() {
text: RED._("common.label.import"),
click: function() {
var addNewFlow = ($("#red-ui-clipboard-dialog-import-opt > a.selected").attr('id') === 'red-ui-clipboard-dialog-import-opt-new');
- if (activeTab === "red-ui-clipboard-dialog-red-ui-clipboard-dialog-import-opt-clipboard") {
+ if (activeTab === "red-ui-clipboard-dialog-import-tab-clipboard") {
RED.view.importNodes($("#red-ui-clipboard-dialog-import-text").val(),addNewFlow);
} else {
- var selectedPath = libraryBrowser.getSelected();
+ var selectedPath;
+ if (activeTab === "red-ui-clipboard-dialog-import-tab-library") {
+ selectedPath = libraryBrowser.getSelected();
+ } else {
+ selectedPath = examplesBrowser.getSelected();
+ }
if (selectedPath.path) {
$.get('library/'+selectedPath.library+'/'+selectedPath.type+'/'+selectedPath.path, function(data) {
RED.view.importNodes(data,addNewFlow);
@@ -214,9 +220,8 @@ RED.clipboard = (function() {
''+
'
'+
''+
- ''+
- '
'+
+ ''+
+ ''+
''+
@@ -386,30 +391,49 @@ RED.clipboard = (function() {
id: "red-ui-clipboard-dialog-import-tab-library",
label: RED._("library.library")
});
-
- tabs.activateTab("red-ui-clipboard-dialog-import-tab-"+mode);
- if (mode === 'clipboard') {
- setTimeout(function() {
- $("#red-ui-clipboard-dialog-import-text").trigger("focus");
- },100)
- }
-
+ tabs.addTab({
+ id: "red-ui-clipboard-dialog-import-tab-examples",
+ label: RED._("library.types.examples")
+ });
$("#red-ui-clipboard-dialog-tab-library-name").on("keyup", validateExportFilename);
$("#red-ui-clipboard-dialog-tab-library-name").on('paste',function() { setTimeout(validateExportFilename,10)});
$("#red-ui-clipboard-dialog-export").button("enable");
libraryBrowser = RED.library.createBrowser({
- container: $("#red-ui-clipboard-dialog-import-tab-library-browser"),
+ container: $("#red-ui-clipboard-dialog-import-tab-library"),
onselect: function(file) {
if (file && file.label && !file.children) {
$("#red-ui-clipboard-dialog-ok").button("enable");
} else {
$("#red-ui-clipboard-dialog-ok").button("disable");
}
+ },
+ onconfirm: function(item) {
+ if (item && item.label && !item.children) {
+ $("#red-ui-clipboard-dialog-ok").trigger("click");
+ }
}
})
- loadFlowLibrary(libraryBrowser,true);
+ loadFlowLibrary(libraryBrowser,"local",RED._("library.types.local"));
+
+ examplesBrowser = RED.library.createBrowser({
+ container: $("#red-ui-clipboard-dialog-import-tab-examples"),
+ onselect: function(file) {
+ if (file && file.label && !file.children) {
+ $("#red-ui-clipboard-dialog-ok").button("enable");
+ } else {
+ $("#red-ui-clipboard-dialog-ok").button("disable");
+ }
+ },
+ onconfirm: function(item) {
+ if (item && item.label && !item.children) {
+ $("#red-ui-clipboard-dialog-ok").trigger("click");
+ }
+ }
+ })
+ loadFlowLibrary(examplesBrowser,"_examples_",RED._("library.types.examples"));
+
dialogContainer.i18n();
@@ -443,6 +467,14 @@ RED.clipboard = (function() {
$("#red-ui-clipboard-dialog-import-file-upload").trigger("click");
})
+ tabs.activateTab("red-ui-clipboard-dialog-import-tab-"+mode);
+ if (mode === 'clipboard') {
+ setTimeout(function() {
+ $("#red-ui-clipboard-dialog-import-text").trigger("focus");
+ },100)
+ }
+
+
dialog.dialog("option","title",RED._("clipboard.importNodes")).dialog("open");
popover = RED.popover.create({
target: $("#red-ui-clipboard-dialog-import-text"),
@@ -489,8 +521,6 @@ RED.clipboard = (function() {
label: RED._("library.library")
});
- tabs.activateTab("red-ui-clipboard-dialog-export-tab-"+mode);
-
$("#red-ui-clipboard-dialog-tab-library-name").on("keyup", validateExportFilename);
$("#red-ui-clipboard-dialog-tab-library-name").on('paste',function() { setTimeout(validateExportFilename,10)});
$("#red-ui-clipboard-dialog-export").button("enable");
@@ -504,7 +534,7 @@ RED.clipboard = (function() {
}
}
})
- loadFlowLibrary(libraryBrowser,false);
+ loadFlowLibrary(libraryBrowser,"local",RED._("library.types.local"));
$("#red-ui-clipboard-dialog-tab-library-name").val("flows.json").select();
@@ -606,6 +636,7 @@ RED.clipboard = (function() {
} else {
$("#red-ui-clipboard-dialog-export-fmt-mini").trigger("click");
}
+ tabs.activateTab("red-ui-clipboard-dialog-export-tab-"+mode);
dialog.dialog("option","title",RED._("clipboard.exportNodes")).dialog( "open" );
$("#red-ui-clipboard-dialog-export-text").trigger("focus");
@@ -615,38 +646,37 @@ RED.clipboard = (function() {
}
- function loadFlowLibrary(browser,includeExamples) {
- var listing = [];
- if (includeExamples) {
- listing.push({
- library: "_examples_",
- type: "flows",
- icon: 'fa fa-hdd-o',
- label: RED._("library.types.examples"),
- path: "",
- children: function(item,done) {
- RED.library.loadLibraryFolder("_examples_","flows","",function(children) {
- item.children = children;
- done(children);
- })
- }
- })
- }
- listing.push({
- library: "local",
+ function loadFlowLibrary(browser,library,label) {
+ // if (includeExamples) {
+ // listing.push({
+ // library: "_examples_",
+ // type: "flows",
+ // icon: 'fa fa-hdd-o',
+ // label: RED._("library.types.examples"),
+ // path: "",
+ // children: function(done,item) {
+ // RED.library.loadLibraryFolder("_examples_","flows","",function(children) {
+ // item.children = children;
+ // done(children);
+ // })
+ // }
+ // })
+ // }
+ browser.data([{
+ library: library,
type: "flows",
icon: 'fa fa-hdd-o',
- label: RED._("library.types.local"),
+ label: label,
path: "",
expanded: true,
- children: function(item,done) {
- RED.library.loadLibraryFolder("local","flows","",function(children) {
+ children: function(done, item) {
+ RED.library.loadLibraryFolder(library,"flows","",function(children) {
item.children = children;
done(children);
})
}
- })
- browser.data(listing);
+ }], true);
+
}
function hideDropTarget() {
@@ -700,17 +730,20 @@ RED.clipboard = (function() {
init: function() {
setupDialogs();
- $('').appendTo("#red-ui-editor");
+ $('').appendTo("#red-ui-editor");
RED.actions.add("core:show-export-dialog",exportNodes);
RED.actions.add("core:show-import-dialog",importNodes);
- RED.actions.add("core:library-export",function() { exportNodes('library') });
+ RED.actions.add("core:show-library-export-dialog",function() { exportNodes('library') });
+ RED.actions.add("core:show-library-import-dialog",function() { importNodes('library') });
RED.events.on("editor:open",function() { disabled = true; });
RED.events.on("editor:close",function() { disabled = false; });
RED.events.on("search:open",function() { disabled = true; });
RED.events.on("search:close",function() { disabled = false; });
+ RED.events.on("actionList:open",function() { disabled = true; });
+ RED.events.on("actionList:close",function() { disabled = false; });
RED.events.on("type-search:open",function() { disabled = true; });
RED.events.on("type-search:close",function() { disabled = false; });
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
index 0464866f7..d4fa53dfa 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
@@ -32,6 +32,7 @@
* - scrollOnAdd : boolean - whether to scroll to newly added items
* methods:
* - addItem(itemData)
+ * - insertItemAt : function(data,index) - add an item at the specified index
* - removeItem(itemData)
* - width(width)
* - height(height)
@@ -185,6 +186,7 @@
}
},
_destroy: function() {
+ this.topContainer.remove();
},
_refreshFilter: function() {
var that = this;
@@ -230,7 +232,7 @@
this.uiHeight = desiredHeight;
this._resize();
},
- addItem: function(data) {
+ insertItemAt: function(data,index) {
var that = this;
data = data || {};
var li = $('