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

Update add-junction menu to work in more cases

Browse Source
This commit is contained in:
Nick O'Leary 2022-07-01 10:31:50 +01:00
parent f041159aa7
commit 0a5d7c2100
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,16 @@ RED.contextMenu = (function() {
const isGroup = hasSelection && selection.nodes.length === 1 && selection.nodes[0].type === 'group' const isGroup = hasSelection && selection.nodes.length === 1 && selection.nodes[0].type === 'group'
const canRemoveFromGroup = hasSelection && !!selection.nodes[0].g const canRemoveFromGroup = hasSelection && !!selection.nodes[0].g
const offset = $("#red-ui-workspace-chart").offset()
let addX = options.x - offset.left + $("#red-ui-workspace-chart").scrollLeft()
let addY = options.y - offset.top + $("#red-ui-workspace-chart").scrollTop()
if (RED.view.snapGrid) {
const gridSize = RED.view.gridSize()
addX = gridSize*Math.floor(addX/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() {} },
@ -54,17 +63,42 @@ RED.contextMenu = (function() {
label: RED._("contextMenu.node"), label: RED._("contextMenu.node"),
onselect: function() { onselect: function() {
RED.view.showQuickAddDialog({ RED.view.showQuickAddDialog({
position: [ options.x - offset.left, options.y - offset.top ], 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 ) ? {
label: RED._("contextMenu.junction"), label: RED._("contextMenu.junction"),
onselect: 'core:split-wires-with-junctions', onselect: 'core:split-wires-with-junctions',
disabled: hasSelection || !hasLinks disabled: !hasLinks
} : {
label: RED._("contextMenu.junction"),
onselect: function() {
const nn = {
_def: {defaults:{}},
type: 'junction',
z: RED.workspaces.active(),
id: RED.nodes.id(),
x: addX,
y: addY,
w: 0, h: 0,
outputs: 1,
inputs: 1,
dirty: true
}
const historyEvent = {
dirty: RED.nodes.dirty(),
t:'add',
junctions:[nn]
}
RED.nodes.addJunction(nn);
RED.history.push(historyEvent);
RED.nodes.dirty(true);
RED.view.redraw(true)
}
}, },
{ {
label: RED._("contextMenu.linkNodes"), label: RED._("contextMenu.linkNodes"),
@ -118,7 +152,6 @@ RED.contextMenu = (function() {
} }
} }
const offset = $("#red-ui-workspace-chart").offset()
menu = RED.menu.init({ menu = RED.menu.init({
direction: 'right', direction: 'right',
onpreselect: function() { onpreselect: function() {