wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-01-27 23:00:20 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

cleaned up conflicts

Browse Source
This commit is contained in:
Julien Lubimiv 2023-03-30 02:39:56 -04:00
parent 76d9fd22ec
commit 378e02c114
3 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/extensions/core/widgetInputs.js
View File

@ -287,15 +287,10 @@ app.registerExtension({
widget.value = theirWidget.value; widget.value = theirWidget.value;
} }
} }
<<<<<<< HEAD
if (widget.type === "combo") { if (widget.type === "combo") {
addSeedControlWidget(this, widget, "randomize"); addSeedControlWidget(this, widget, "randomize");
=======
if (widget.type === "combo") {
addSeedControlWidget(this, widget, "fixed seed");
>>>>>>> 1518b385a7a2f22887dabd97f45548197f65fad3
} }
// When our value changes, update other widgets to reflect our changes // When our value changes, update other widgets to reflect our changes

6
web/scripts/app.js
View File

@ -771,17 +771,11 @@ class ComfyApp {
widget.value = widget.value.slice(7); widget.value = widget.value.slice(7);
} }
} }
<<<<<<< HEAD
if (widget.name == "seed control after generating") { if (widget.name == "seed control after generating") {
if (widget.value == true) { if (widget.value == true) {
widget.value = "randomize"; widget.value = "randomize";
=======
if (widget.name == "seed control after generating") {
if (widget.value == true) {
widget.value = "fixed seed";
>>>>>>> 1518b385a7a2f22887dabd97f45548197f65fad3
} }
} }
} }

15
web/scripts/widgets.js
View File

@ -10,13 +10,8 @@ function getNumberDefaults(inputData, defaultStep) {
return { val: defaultVal, config: { min, max, step: 10.0 * step } }; return { val: defaultVal, config: { min, max, step: 10.0 * step } };
} }
<<<<<<< HEAD
export function addSeedControlWidget(node, targetWidget, defaultValue = "randomize", values) { export function addSeedControlWidget(node, targetWidget, defaultValue = "randomize", values) {
const seedControl = node.addWidget("combo", "seed control after generating", "randomize", function (v) { }, { const seedControl = node.addWidget("combo", "seed control after generating", "randomize", function (v) { }, {
=======
export function addSeedControlWidget(node, targetWidget, defaultValue = "fixed seed", values) {
const seedControl = node.addWidget("combo", "seed control after generating", "fixed seed", function (v) { }, {
>>>>>>> 1518b385a7a2f22887dabd97f45548197f65fad3
values: ["fixed seed", "increment", "decrement", "randomize"] values: ["fixed seed", "increment", "decrement", "randomize"]
}) })
seedControl.afterQueued = () => { seedControl.afterQueued = () => {
@ -55,21 +50,13 @@ export function addSeedControlWidget(node, targetWidget, defaultValue = "fixed s
console.log("default (fail)"); console.log("default (fail)");
} }
}; };
<<<<<<< HEAD
=======
>>>>>>> 1518b385a7a2f22887dabd97f45548197f65fad3
return seedControl; return seedControl;
} }
function seedWidget(node, inputName, inputData) { function seedWidget(node, inputName, inputData) {
const seed = ComfyWidgets.INT(node, inputName, inputData); const seed = ComfyWidgets.INT(node, inputName, inputData);
<<<<<<< HEAD
const seedControl = addSeedControlWidget(node, seed.widget, "randomize"); const seedControl = addSeedControlWidget(node, seed.widget, "randomize");
=======
const seedControl = addSeedControlWidget(node, seed.widget, "fixed seed");
>>>>>>> 1518b385a7a2f22887dabd97f45548197f65fad3
seed.widget.linkedWidgets = [seedControl]; seed.widget.linkedWidgets = [seedControl];
return { widget: seed, seedControl }; return { widget: seed, seedControl };