more #392
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
import { any_restrictions, describe_restrictions } from "./ue_properties.js";
|
import { any_restrictions, describe_restrictions } from "./ue_properties.js";
|
||||||
import { app } from "../../scripts/app.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 { edit_window } from "./floating_window.js";
|
||||||
import { settingsCache } from "./use_everywhere_cache.js";
|
import { settingsCache } from "./use_everywhere_cache.js";
|
||||||
|
|
||||||
@@ -46,7 +46,7 @@ export function maybe_show_tooltip() {
|
|||||||
|
|
||||||
if (!node) return hide_tooltip()
|
if (!node) return hide_tooltip()
|
||||||
if (edit_window.showing) 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
|
if (ue_tooltip_element.showing) return
|
||||||
|
|
||||||
|
|||||||
+3
-4
@@ -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 { i18n, i18n_functional, GROUP_RESTRICTION_OPTIONS, COLOR_RESTRICTION_OPTIONS } from "./i18n.js";
|
||||||
import { shared } from "./shared.js";
|
import { shared } from "./shared.js";
|
||||||
import { fix_inputs } from "./connections.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
|
In that case the properties need to be set later, in setup_ue_properties_onload
|
||||||
*/
|
*/
|
||||||
export function setup_ue_properties_oncreate(node) {
|
export function setup_ue_properties_oncreate(node) {
|
||||||
node.IS_UE = true
|
|
||||||
if (shared.graph_being_configured) return
|
if (shared.graph_being_configured) return
|
||||||
if (!node.properties) node.properties = {}
|
if (!node.properties) node.properties = {}
|
||||||
node.properties.ue_properties = {...DEFAULT_PROPERTIES}
|
node.properties.ue_properties = {...DEFAULT_PROPERTIES}
|
||||||
@@ -87,7 +86,7 @@ Convert node properties when loaded.
|
|||||||
export function setup_ue_properties_onload(node) {
|
export function setup_ue_properties_onload(node) {
|
||||||
if (!node.properties?.ue_properties) node.properties.ue_properties = {}
|
if (!node.properties?.ue_properties) node.properties.ue_properties = {}
|
||||||
if ( !version_at_least(node.properties?.ue_properties?.version, "7.0") ) {
|
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
|
// convert a pre 7.0 UE node
|
||||||
node.properties.ue_properties = {
|
node.properties.ue_properties = {
|
||||||
version : VERSION,
|
version : VERSION,
|
||||||
@@ -117,7 +116,7 @@ export function setup_ue_properties_onload(node) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function convert_node_types(node) {
|
function convert_node_types(node) {
|
||||||
if (!node.IS_UE) return
|
if (!is_UEnode(node)) return
|
||||||
|
|
||||||
if (node.type=="Anything Everywhere?") {
|
if (node.type=="Anything Everywhere?") {
|
||||||
node.widgets.forEach((w)=>{w.hidden=true})
|
node.widgets.forEach((w)=>{w.hidden=true})
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ app.registerExtension({
|
|||||||
const onConnectionsChange = nodeType.prototype.onConnectionsChange;
|
const onConnectionsChange = nodeType.prototype.onConnectionsChange;
|
||||||
nodeType.prototype.onConnectionsChange = function (side,slot,connect,link_info,output) {
|
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 (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)
|
input_changed(this, slot, connect, link_info)
|
||||||
|
|
||||||
if (!shared.graph_being_configured) {
|
if (!shared.graph_being_configured) {
|
||||||
@@ -307,7 +307,7 @@ app.registerExtension({
|
|||||||
app.canvas.canvas.addEventListener('litegraph:canvas', (e)=>{
|
app.canvas.canvas.addEventListener('litegraph:canvas', (e)=>{
|
||||||
if (e?.detail?.subType=='node-double-click') {
|
if (e?.detail?.subType=='node-double-click') {
|
||||||
const node = e.detail.node
|
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<node.pos[1]) return
|
if (app.ui.settings.getSettingValue('Comfy.Node.DoubleClickTitleToEdit') && e.detail.originalEvent.canvasY<node.pos[1]) return
|
||||||
edit_restrictions(null, null, null, null, node)
|
edit_restrictions(null, null, null, null, node)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ class GraphConverter {
|
|||||||
if (node.properties?.ue_properties?.widget_ue_connectable) return
|
if (node.properties?.ue_properties?.widget_ue_connectable) return
|
||||||
if (node.properties?.widget_ue_connectable) return // pre 7.0 node which will be converted
|
if (node.properties?.widget_ue_connectable) return // pre 7.0 node which will be converted
|
||||||
|
|
||||||
if (node.IS_UE) {
|
if (is_UEnode(node)) {
|
||||||
if (node.properties?.ue_properties?.version) return
|
if (node.properties?.ue_properties?.version) return
|
||||||
this.clean_ue_node(node)
|
this.clean_ue_node(node)
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -67,8 +67,8 @@ class SeedEverywhere(io.ComfyNode):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def execute(cls, string): # type: ignore
|
def execute(cls, seed): # type: ignore
|
||||||
return io.NodeOutput(string)
|
return io.NodeOutput(seed)
|
||||||
|
|
||||||
class AnythingEverywhere(io.ComfyNode):
|
class AnythingEverywhere(io.ComfyNode):
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|||||||
Reference in New Issue
Block a user