wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-02-09 13:02:31 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

resolved merge

Browse Source
This commit is contained in:
FizzleDorf 2023-03-31 19:03:09 -04:00
parent 05756a2563
commit 27bae076bf
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,13 +301,10 @@ app.registerExtension({
} }
} }
<<<<<<< HEAD
=======
if (widget.type === "combo") { if (widget.type === "combo") {
addSeedControlWidget(this, widget, "randomize"); addSeedControlWidget(this, widget, "randomize");
} }
>>>>>>> origin/master
// When our value changes, update other widgets to reflect our changes // When our value changes, update other widgets to reflect our changes
// e.g. so LoadImage shows correct image // e.g. so LoadImage shows correct image
const callback = widget.callback; const callback = widget.callback;

7
web/scripts/app.js
View File

@ -828,18 +828,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 = "randomize";
}
>>>>>>> origin/master
} }
} }
} }

3
web/scripts/widgets.js
View File

@ -50,10 +50,7 @@ export function addSeedControlWidget(node, targetWidget, defaultValue = "randomi
console.log("default (fail)"); console.log("default (fail)");
} }
}; };
<<<<<<< HEAD
=======
>>>>>>> origin/master
return seedControl; return seedControl;
} }