From cdc3da92b23532231e5ee447cd4e0f602d5ac847 Mon Sep 17 00:00:00 2001 From: tamat Date: Wed, 24 Oct 2018 18:54:06 +0200 Subject: [PATCH] minor fixes --- demo/js/demos.js | 4 ++-- src/litegraph.js | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/demo/js/demos.js b/demo/js/demos.js index 5e1ac0446..233990399 100644 --- a/demo/js/demos.js +++ b/demo/js/demos.js @@ -94,9 +94,9 @@ function TestWidgetsNode() this.size = this.computeSize(); } -TestWidgetsNode.title = "Test Widgets"; +TestWidgetsNode.title = "Widgets"; -LiteGraph.registerNodeType("widget/test", TestWidgetsNode ); +LiteGraph.registerNodeType("features/widgets", TestWidgetsNode ); //Show value inside the debug console diff --git a/src/litegraph.js b/src/litegraph.js index b6c7a2bc3..19e8f66e1 100755 --- a/src/litegraph.js +++ b/src/litegraph.js @@ -7066,7 +7066,7 @@ LGraphCanvas.prototype.processContextMenu = function( node, event ) var ref_window = canvas.getCanvasWindow(); var menu_info = null; - var options = { event: event, callback: inner_option_clicked, node: node }; + var options = { event: event, callback: inner_option_clicked, extra: node }; //check if mouse is in input var slot = null; @@ -7093,14 +7093,10 @@ LGraphCanvas.prototype.processContextMenu = function( node, event ) menu_info = this.getNodeMenuOptions(node); else { + menu_info = this.getCanvasMenuOptions(); var group = this.graph.getGroupOnPos( event.canvasX, event.canvasY ); if( group ) //on group - { - options.node = group; - menu_info = this.getGroupMenuOptions( group ); - } - else - menu_info = this.getCanvasMenuOptions(); + menu_info.push({content:"Group", has_submenu: true, submenu: { title:"Group", extra: group, options: this.getGroupMenuOptions( group ) }}); } } @@ -7513,7 +7509,7 @@ ContextMenu.prototype.addItem = function( name, value, options ) { if (value.callback && !options.ignore_item_callbacks && value.disabled !== true ) //item callback { - var r = value.callback.call( this, value, options, e, that, options.node ); + var r = value.callback.call( this, value, options, e, that, options.extra ); if(r === true) close_parent = false; } @@ -7527,6 +7523,7 @@ ContextMenu.prototype.addItem = function( name, value, options ) parentMenu: that, ignore_item_callbacks: value.submenu.ignore_item_callbacks, title: value.submenu.title, + extra: value.submenu.extra, autoopen: options.autoopen }); close_parent = false;