frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into pr_3744

Browse Source
This commit is contained in:
Nick O'Leary 2022-07-08 13:08:26 +01:00 committed by GitHub
commit 241b47fe19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js vendored
View File

@ -1,4 +1,4 @@
RED.contextMenu = (function() { RED.contextMenu = (function () {
let menu; let menu;
function createMenu() { function createMenu() {
@ -15,10 +15,6 @@ RED.contextMenu = (function() {
// ], // ],
// width: 200, // width: 200,
// }) // })
} }
function disposeMenu() { function disposeMenu() {
@ -50,35 +46,35 @@ RED.contextMenu = (function() {
if (RED.view.snapGrid) { if (RED.view.snapGrid) {
const gridSize = RED.view.gridSize() const gridSize = RED.view.gridSize()
addX = gridSize*Math.floor(addX/gridSize) addX = gridSize * Math.floor(addX / gridSize)
addY = gridSize*Math.floor(addY/gridSize) addY = gridSize * Math.floor(addY / gridSize)
} }
const menuItems = [ const menuItems = [
{ onselect: 'core:show-action-list', onpostselect: function() {} }, { onselect: 'core:show-action-list', onpostselect: function () { } },
{ {
label: RED._("contextMenu.insert"), label: RED._("contextMenu.insert"),
options: [ options: [
{ {
label: RED._("contextMenu.node"), label: RED._("contextMenu.node"),
onselect: function() { onselect: function () {
RED.view.showQuickAddDialog({ RED.view.showQuickAddDialog({
position: [ addX, addY ], position: [addX, addY],
touchTrigger: true, touchTrigger: true,
splice: isSingleLink?selection.links[0]:undefined, splice: isSingleLink ? selection.links[0] : undefined,
// spliceMultiple: isMultipleLinks // spliceMultiple: isMultipleLinks
}) })
} }
}, },
( hasSelection || hasLinks ) ? { (hasSelection || hasLinks) ? {
label: RED._("contextMenu.junction"), label: RED._("contextMenu.junction"),
onselect: 'core:split-wires-with-junctions', onselect: 'core:split-wires-with-junctions',
disabled: !hasLinks disabled: !hasLinks
} : { } : {
label: RED._("contextMenu.junction"), label: RED._("contextMenu.junction"),
onselect: function() { onselect: function () {
const nn = { const nn = {
_def: {defaults:{}}, _def: { defaults: {} },
type: 'junction', type: 'junction',
z: RED.workspaces.active(), z: RED.workspaces.active(),
id: RED.nodes.id(), id: RED.nodes.id(),
@ -91,8 +87,8 @@ RED.contextMenu = (function() {
} }
const historyEvent = { const historyEvent = {
dirty: RED.nodes.dirty(), dirty: RED.nodes.dirty(),
t:'add', t: 'add',
junctions:[nn] junctions: [nn]
} }
RED.nodes.addJunction(nn); RED.nodes.addJunction(nn);
RED.history.push(historyEvent); RED.history.push(historyEvent);
@ -103,7 +99,7 @@ RED.contextMenu = (function() {
{ {
label: RED._("contextMenu.linkNodes"), label: RED._("contextMenu.linkNodes"),
onselect: 'core:split-wire-with-link-nodes', onselect: 'core:split-wire-with-link-nodes',
disabled: hasSelection || !hasLinks disabled: !hasLinks
} }
] ]
@ -111,28 +107,13 @@ RED.contextMenu = (function() {
} }
] ]
// menuItems.push(
// {
// label: (isSingleLink || isMultipleLinks)?'Insert into wire...':'Add node...',
// onselect: function() {
// RED.view.showQuickAddDialog({
// position: [ options.x - offset.left, options.y - offset.top ],
// touchTrigger: true,
// splice: isSingleLink?selection.links[0]:undefined,
// spliceMultiple: isMultipleLinks
// })
// }
// },
// )
// if (hasLinks && !hasSelection) {
// menuItems.push({ onselect: 'core:split-wires-with-junctions', label: 'Insert junction'})
// }
menuItems.push( menuItems.push(
null, null,
{ onselect: 'core:undo', disabled: RED.history.list().length === 0 }, { onselect: 'core:undo', disabled: RED.history.list().length === 0 },
{ onselect: 'core:redo', disabled: RED.history.listRedo().length === 0 }, { onselect: 'core:redo', disabled: RED.history.listRedo().length === 0 },
null, null,
{ onselect: 'core:cut-selection-to-internal-clipboard', label: RED._("keyboard.cutNode"), disabled: !hasSelection}, { onselect: 'core:cut-selection-to-internal-clipboard', label: RED._("keyboard.cutNode"), disabled: !hasSelection },
{ onselect: 'core:copy-selection-to-internal-clipboard', label: RED._("keyboard.copyNode"), disabled: !hasSelection }, { onselect: 'core:copy-selection-to-internal-clipboard', label: RED._("keyboard.copyNode"), disabled: !hasSelection },
{ onselect: 'core:paste-from-internal-clipboard', label: RED._("keyboard.pasteNode"), disabled: !RED.view.clipboard() }, { onselect: 'core:paste-from-internal-clipboard', label: RED._("keyboard.pasteNode"), disabled: !RED.view.clipboard() },
{ onselect: 'core:delete-selection', disabled: !canDelete }, { onselect: 'core:delete-selection', disabled: !canDelete },
@ -144,8 +125,8 @@ RED.contextMenu = (function() {
menuItems.push( menuItems.push(
null, null,
isGroup ? isGroup ?
{ onselect: 'core:ungroup-selection', disabled: !isGroup } { onselect: 'core:ungroup-selection', disabled: !isGroup }
: { onselect: 'core:group-selection', disabled: !hasSelection } : { onselect: 'core:group-selection', disabled: !hasSelection }
) )
if (canRemoveFromGroup) { if (canRemoveFromGroup) {
menuItems.push({ onselect: 'core:remove-selection-from-group', label: RED._("menu.label.groupRemoveSelection") }) menuItems.push({ onselect: 'core:remove-selection-from-group', label: RED._("menu.label.groupRemoveSelection") })
@ -165,13 +146,13 @@ RED.contextMenu = (function() {
onpreselect: function() { onpreselect: function() {
disposeMenu() disposeMenu()
}, },
onpostselect: function() { onpostselect: function () {
RED.view.focus() RED.view.focus()
}, },
options: menuItems options: menuItems
}); });
menu.attr("id","red-ui-workspace-context-menu"); menu.attr("id", "red-ui-workspace-context-menu");
menu.css({ menu.css({
position: "absolute" position: "absolute"
}) })
@ -182,34 +163,35 @@ RED.contextMenu = (function() {
var top = options.y var top = options.y
var left = options.x var left = options.x
if (top+menu.height()-$(document).scrollTop() > $(window).height()) { if (top + menu.height() - $(document).scrollTop() > $(window).height()) {
top -= (top+menu.height())-$(window).height() + 22; top -= (top + menu.height()) - $(window).height() + 22;
} }
if (left+menu.width()-$(document).scrollLeft() > $(window).width()) { if (left + menu.width() - $(document).scrollLeft() > $(window).width()) {
left -= (left+menu.width())-$(window).width() + 18; left -= (left + menu.width()) - $(window).width() + 18;
} }
menu.css({ menu.css({
top: top+"px", top: top + "px",
left: left+"px" left: left + "px"
}) })
$(".red-ui-menu.red-ui-menu-dropdown").hide(); $(".red-ui-menu.red-ui-menu-dropdown").hide();
$(document).on("mousedown.red-ui-workspace-context-menu", function(evt) { $(document).on("mousedown.red-ui-workspace-context-menu", function (evt) {
if (menu && menu[0].contains(evt.target)) { if (menu && menu[0].contains(evt.target)) {
return return
} }
disposeMenu() disposeMenu()
}); });
menu.show(); menu.show();
// set focus to first item so that pressing escape key closes the menu
// menu.show({ $("#red-ui-workspace-context-menu :first(ul) > a").trigger("focus")
// target: $('#red-ui-main-container'),
// x: options.x,
// y: options.y
// })
} }
// Allow escape key hook and other editor events to close context menu
RED.keyboard.add("red-ui-workspace-context-menu", "escape", function () { RED.contextMenu.hide() })
RED.events.on("editor:open", function () { RED.contextMenu.hide() });
RED.events.on("search:open", function () { RED.contextMenu.hide() });
RED.events.on("type-search:open", function () { RED.contextMenu.hide() });
RED.events.on("actionList:open", function () { RED.contextMenu.hide() });
RED.events.on("view:selection-changed", function () { RED.contextMenu.hide() });
return { return {
show: show, show: show,
hide: disposeMenu hide: disposeMenu

12
packages/node_modules/@node-red/editor-client/src/js/ui/view.js vendored
View File

@ -3293,11 +3293,17 @@ RED.view = (function() {
if (active && ((portType === PORT_TYPE_INPUT && ((d._def && d._def.inputLabels)||d.inputLabels)) || (portType === PORT_TYPE_OUTPUT && ((d._def && d._def.outputLabels)||d.outputLabels)))) { if (active && ((portType === PORT_TYPE_INPUT && ((d._def && d._def.inputLabels)||d.inputLabels)) || (portType === PORT_TYPE_OUTPUT && ((d._def && d._def.outputLabels)||d.outputLabels)))) {
portLabelHoverTimeout = setTimeout(function() { portLabelHoverTimeout = setTimeout(function() {
const n = port && port.node()
const nId = n && n.__data__ && n.__data__.id
//check see if node has been deleted since timeout started
if(!n || !n.parentNode || !RED.nodes.node(n.__data__.id)) {
return; //node is gone!
}
var tooltip = getPortLabel(d,portType,portIndex); var tooltip = getPortLabel(d,portType,portIndex);
if (!tooltip) { if (!tooltip) {
return; return;
} }
var pos = getElementPosition(port.node()); var pos = getElementPosition(n);
portLabelHoverTimeout = null; portLabelHoverTimeout = null;
portLabelHover = showTooltip( portLabelHover = showTooltip(
(pos[0]+(portType===PORT_TYPE_INPUT?-2:12)), (pos[0]+(portType===PORT_TYPE_INPUT?-2:12)),
@ -3734,6 +3740,10 @@ RED.view = (function() {
if (d.hasOwnProperty('l')?!d.l : (d.type === "link in" || d.type === "link out")) { if (d.hasOwnProperty('l')?!d.l : (d.type === "link in" || d.type === "link out")) {
var parentNode = this.parentNode; var parentNode = this.parentNode;
portLabelHoverTimeout = setTimeout(function() { portLabelHoverTimeout = setTimeout(function() {
//check see if node has been deleted since timeout started
if(!parentNode || !parentNode.parentNode || !RED.nodes.node(parentNode.id)) {
return; //node is gone!
}
var tooltip; var tooltip;
if (d._def.label) { if (d._def.label) {
tooltip = d._def.label; tooltip = d._def.label;

50
packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js vendored
View File

@ -459,30 +459,38 @@ RED.debug = (function() {
function showMessageMenu(button,dbgMessage,sourceId) { function showMessageMenu(button,dbgMessage,sourceId) {
activeMenuMessage = dbgMessage; activeMenuMessage = dbgMessage;
if (!menuOptionMenu) { if (!menuOptionMenu) {
menuOptionMenu = RED.menu.init({id:"red-ui-debug-msg-option-menu", var opts = [
options: [ {id:"red-ui-debug-msg-menu-item-collapse",label:RED._("node-red:debug.messageMenu.collapseAll"),onselect:function(){
{id:"red-ui-debug-msg-menu-item-collapse",label:RED._("node-red:debug.messageMenu.collapseAll"),onselect:function(){ activeMenuMessage.collapse();
activeMenuMessage.collapse(); }},
}}, ];
if (activeMenuMessage.clearPinned) {
opts.push(
{id:"red-ui-debug-msg-menu-item-clear-pins",label:RED._("node-red:debug.messageMenu.clearPinned"),onselect:function(){ {id:"red-ui-debug-msg-menu-item-clear-pins",label:RED._("node-red:debug.messageMenu.clearPinned"),onselect:function(){
activeMenuMessage.clearPinned(); activeMenuMessage.clearPinned();
}}, }},
null, );
{id:"red-ui-debug-msg-menu-item-filter", label:RED._("node-red:debug.messageMenu.filterNode"),onselect:function(){ }
var candidateNodes = RED.nodes.filterNodes({type:'debug'}); opts.push(
candidateNodes.forEach(function(n) { null,
filteredNodes[n.id] = true; {id:"red-ui-debug-msg-menu-item-filter", label:RED._("node-red:debug.messageMenu.filterNode"),onselect:function(){
}); var candidateNodes = RED.nodes.filterNodes({type:'debug'});
delete filteredNodes[sourceId]; candidateNodes.forEach(function(n) {
$("#red-ui-sidebar-debug-filterSelected").trigger("click"); filteredNodes[n.id] = true;
RED.settings.set('debug.filteredNodes',Object.keys(filteredNodes)) });
refreshMessageList(); delete filteredNodes[sourceId];
}}, $("#red-ui-sidebar-debug-filterSelected").trigger("click");
{id:"red-ui-debug-msg-menu-item-clear-filter",label:RED._("node-red:debug.messageMenu.clearFilter"),onselect:function(){ RED.settings.set('debug.filteredNodes',Object.keys(filteredNodes))
$("#red-ui-sidebar-debug-filterAll").trigger("click"); refreshMessageList();
refreshMessageList(); }},
}} {id:"red-ui-debug-msg-menu-item-clear-filter",label:RED._("node-red:debug.messageMenu.clearFilter"),onselect:function(){
] $("#red-ui-sidebar-debug-filterAll").trigger("click");
refreshMessageList();
}}
);
menuOptionMenu = RED.menu.init({id:"red-ui-debug-msg-option-menu",
options: opts
}); });
menuOptionMenu.css({ menuOptionMenu.css({
position: "absolute" position: "absolute"