From 5aaaaa5e14373baea8c7c707097186c551601247 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 15 Oct 2025 11:32:25 +1100 Subject: [PATCH] more #392 --- js/tooltip_window.js | 4 ++-- js/ue_properties.js | 7 +++---- js/use_everywhere.js | 4 ++-- js/use_everywhere_utilities.js | 2 +- use_everywhere.py | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/js/tooltip_window.js b/js/tooltip_window.js index b89a00e..4b56648 100644 --- a/js/tooltip_window.js +++ b/js/tooltip_window.js @@ -1,7 +1,7 @@ import { any_restrictions, describe_restrictions } from "./ue_properties.js"; import { app } from "../../scripts/app.js"; -import { create } from "./use_everywhere_utilities.js"; +import { create, is_UEnode } from "./use_everywhere_utilities.js"; import { edit_window } from "./floating_window.js"; import { settingsCache } from "./use_everywhere_cache.js"; @@ -46,7 +46,7 @@ export function maybe_show_tooltip() { if (!node) return hide_tooltip() if (edit_window.showing) return hide_tooltip() - if (!(node.IS_UE && any_restrictions(node))) return hide_tooltip() + if (!(is_UEnode(node) && any_restrictions(node))) return hide_tooltip() if (ue_tooltip_element.showing) return diff --git a/js/ue_properties.js b/js/ue_properties.js index 6cf5229..e1b2924 100644 --- a/js/ue_properties.js +++ b/js/ue_properties.js @@ -1,4 +1,4 @@ -import { version_at_least, create } from "./use_everywhere_utilities.js" +import { version_at_least, create, is_UEnode } from "./use_everywhere_utilities.js" import { i18n, i18n_functional, GROUP_RESTRICTION_OPTIONS, COLOR_RESTRICTION_OPTIONS } from "./i18n.js"; import { shared } from "./shared.js"; import { fix_inputs } from "./connections.js"; @@ -74,7 +74,6 @@ If the graph is still being configured, then that means the node is being create In that case the properties need to be set later, in setup_ue_properties_onload */ export function setup_ue_properties_oncreate(node) { - node.IS_UE = true if (shared.graph_being_configured) return if (!node.properties) node.properties = {} node.properties.ue_properties = {...DEFAULT_PROPERTIES} @@ -87,7 +86,7 @@ Convert node properties when loaded. export function setup_ue_properties_onload(node) { if (!node.properties?.ue_properties) node.properties.ue_properties = {} if ( !version_at_least(node.properties?.ue_properties?.version, "7.0") ) { - if (node.IS_UE) { + if (is_UEnode(node)) { // convert a pre 7.0 UE node node.properties.ue_properties = { version : VERSION, @@ -117,7 +116,7 @@ export function setup_ue_properties_onload(node) { } function convert_node_types(node) { - if (!node.IS_UE) return + if (!is_UEnode(node)) return if (node.type=="Anything Everywhere?") { node.widgets.forEach((w)=>{w.hidden=true}) diff --git a/js/use_everywhere.js b/js/use_everywhere.js index f2cbf18..c2e4b7c 100644 --- a/js/use_everywhere.js +++ b/js/use_everywhere.js @@ -64,7 +64,7 @@ app.registerExtension({ const onConnectionsChange = nodeType.prototype.onConnectionsChange; nodeType.prototype.onConnectionsChange = function (side,slot,connect,link_info,output) { if (is_combo_clone(this) && !shared.prompt_being_queued) comboclone_on_connection(this, link_info, connect) - if (this.IS_UE && side==1) { // side 1 is input + if (is_UEnode(this) && side==1) { // side 1 is input input_changed(this, slot, connect, link_info) if (!shared.graph_being_configured) { @@ -307,7 +307,7 @@ app.registerExtension({ app.canvas.canvas.addEventListener('litegraph:canvas', (e)=>{ if (e?.detail?.subType=='node-double-click') { const node = e.detail.node - if (node.IS_UE) { + if (is_UEnode(node)) { if (app.ui.settings.getSettingValue('Comfy.Node.DoubleClickTitleToEdit') && e.detail.originalEvent.canvasY