diff --git a/src/extensions/core/noteNode.js b/src/extensions/core/noteNode.js index 8d89054e9..15517011f 100644 --- a/src/extensions/core/noteNode.js +++ b/src/extensions/core/noteNode.js @@ -1,5 +1,5 @@ import {app} from "../../scripts/app.js"; -import {ComfyWidgets} from "../../scripts/widgets.js"; +import {ComfyWidgets} from "../../scripts/widgets"; // Node that add notes to your project app.registerExtension({ diff --git a/src/extensions/core/slotDefaults.js b/src/extensions/core/slotDefaults.js index 718d25405..1d145301e 100644 --- a/src/extensions/core/slotDefaults.js +++ b/src/extensions/core/slotDefaults.js @@ -1,5 +1,5 @@ import { app } from "../../scripts/app.js"; -import { ComfyWidgets } from "../../scripts/widgets.js"; +import { ComfyWidgets } from "../../scripts/widgets"; // Adds defaults for quickly adding nodes with middle click on the input/output app.registerExtension({ diff --git a/src/extensions/core/widgetInputs.js b/src/extensions/core/widgetInputs.js index f1a1d22cd..bda116f14 100644 --- a/src/extensions/core/widgetInputs.js +++ b/src/extensions/core/widgetInputs.js @@ -1,4 +1,4 @@ -import { ComfyWidgets, addValueControlWidgets } from "../../scripts/widgets.js"; +import { ComfyWidgets, addValueControlWidgets } from "../../scripts/widgets"; import { app } from "../../scripts/app.js"; import { applyTextReplacements } from "../../scripts/utils.js"; diff --git a/src/scripts/app.js b/src/scripts/app.js index feae322ea..28ec496f3 100644 --- a/src/scripts/app.js +++ b/src/scripts/app.js @@ -1,5 +1,5 @@ import { ComfyLogging } from "./logging.js"; -import { ComfyWidgets, initWidgets } from "./widgets.js"; +import { ComfyWidgets, initWidgets } from "./widgets"; import { ComfyUI, $el } from "./ui.js"; import { api } from "./api.js"; import { defaultGraph } from "./defaultGraph.js"; diff --git a/src/scripts/widgets.js b/src/scripts/widgets.ts similarity index 99% rename from src/scripts/widgets.js rename to src/scripts/widgets.ts index aa1360120..9d52a4550 100644 --- a/src/scripts/widgets.js +++ b/src/scripts/widgets.ts @@ -213,7 +213,7 @@ function seedWidget(node, inputName, inputData, app, widgetName) { return seed; } -function createIntWidget(node, inputName, inputData, app, isSeedInput) { +function createIntWidget(node, inputName, inputData, app, isSeedInput: boolean = false) { const control = inputData[1]?.control_after_generate; if (!isSeedInput && control) { return seedWidget(node, inputName, inputData, app, typeof control === "string" ? control : undefined); @@ -398,13 +398,11 @@ export const ComfyWidgets = { }, get : function() { - let value = ""; - if (this._real_value) { - value = this._real_value; - } else { + if (!this._real_value) { return default_value; } + let value = this._real_value; if (value.filename) { let real_value = value; value = "";