diff --git a/web/extensions/core/widgetInputs.js b/web/extensions/core/widgetInputs.js index 235418004..e684e8c2a 100644 --- a/web/extensions/core/widgetInputs.js +++ b/web/extensions/core/widgetInputs.js @@ -5,7 +5,7 @@ const CONVERTED_TYPE = "converted-widget"; const VALID_TYPES = ["STRING", "combo", "number"]; function isConvertableWidget(widget, config) { - if (widget.name == "seed control after generating") + if (widget.name == "seed control after generate") widget.allowConvertToInput = false; else return VALID_TYPES.includes(widget.type) || VALID_TYPES.includes(config[0]); @@ -291,8 +291,8 @@ app.registerExtension({ widget = this.addWidget(type, widgetName /*"value"*/, null, () => { }, {}); } } - - if (widget.type === "number" && widget.name != "seed") { + + if (widget.type === "number" && combinedWidgetType != "INT:seed" && combinedWidgetType != "INT:seed") { addSeedControlWidget(this, widget, "fixed seed"); } diff --git a/web/scripts/widgets.js b/web/scripts/widgets.js index 90b029319..8a9151f07 100644 --- a/web/scripts/widgets.js +++ b/web/scripts/widgets.js @@ -11,8 +11,8 @@ function getNumberDefaults(inputData, defaultStep) { } export function addSeedControlWidget(node, targetWidget, defaultValue = "randomize", values) { - const seedControl = node.addWidget("combo", "seed control after generating", defaultValue, function (v) { }, { - values: ["fixed seed", "increment", "decrement", "randomize"], + const seedControl = node.addWidget("combo", "seed control after generate", defaultValue, function (v) { }, { + values: ["fixed", "increment", "decrement", "randomize"], serialize: false, // Don't include this in prompt. }) seedControl.afterQueued = () => { @@ -23,8 +23,8 @@ export function addSeedControlWidget(node, targetWidget, defaultValue = "randomi let max = targetWidget.options?.max; switch (v) { - case ("fixed seed"): - console.log("Fixed Seed"); + case ("fixed"): + console.log("fixed"); break; case ("increment"): if (min != null || max != null) { @@ -79,7 +79,7 @@ export function addSeedControlWidget(node, targetWidget, defaultValue = "randomi } break; default: - console.log("default (fail)"); + console.log("default (failed to detect input!)"); } };