mirror of
				https://github.com/node-red/node-red.git
				synced 2025-03-01 10:36:34 +00:00 
			
		
		
		
	Merge pull request #3741 from Steve-Mcl/fix-context-menu
Fix context menu issues ready for v3 beta.5
This commit is contained in:
		| @@ -15,10 +15,6 @@ RED.contextMenu = (function() { | ||||
|         //     ], | ||||
|         //     width: 200, | ||||
|         // }) | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|     } | ||||
|  | ||||
|     function disposeMenu() { | ||||
| @@ -103,7 +99,7 @@ RED.contextMenu = (function() { | ||||
|                     { | ||||
|                         label: RED._("contextMenu.linkNodes"), | ||||
|                         onselect: 'core:split-wire-with-link-nodes', | ||||
|                         disabled: hasSelection || !hasLinks | ||||
|                         disabled: !hasLinks | ||||
|                     } | ||||
|                 ] | ||||
|  | ||||
| @@ -111,22 +107,7 @@ 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( | ||||
|             null, | ||||
|             { onselect: 'core:undo', disabled: RED.history.list().length === 0 }, | ||||
| @@ -192,16 +173,17 @@ RED.contextMenu = (function() { | ||||
|             disposeMenu() | ||||
|         }); | ||||
|         menu.show(); | ||||
|  | ||||
|         // menu.show({ | ||||
|         //     target: $('#red-ui-main-container'), | ||||
|         //     x: options.x, | ||||
|         //     y: options.y | ||||
|         // }) | ||||
|  | ||||
|         // set focus to first item so that pressing escape key closes the menu | ||||
|         $("#red-ui-workspace-context-menu :first(ul) > a").trigger("focus") | ||||
|  | ||||
|     } | ||||
|  | ||||
|     // 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 { | ||||
|         show: show, | ||||
|         hide: disposeMenu | ||||
|   | ||||
		Reference in New Issue
	
	Block a user