sneedgroup-holder/openOutpaint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #247 from zero01101/small_fixes

Browse source 
small controlnet ui quirks corrected
This commit is contained in:
tim h 2023-07-22 09:49:05 -05:00 committed by GitHub
commit a99bd390ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
index.html
View file

@ -1,4 +1,4 @@
<!doctype html> <!DOCTYPE html>
<html lang="en-US"> <html lang="en-US">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
@ -315,8 +315,8 @@
<br /> <br />
<span id="version"> <span id="version">
<a href="https://github.com/zero01101/openOutpaint" target="_blank"> <a href="https://github.com/zero01101/openOutpaint" target="_blank">
<s>Alpha release v0.0.16.3</s> <s>Alpha release v0.0.16.4</s>
v20230715.002 v20230722.001
</a> </a>
<br /> <br />
<a <a
@ -513,7 +513,7 @@
<!-- Basics --> <!-- Basics -->
<script src="js/global.js?v=ac30d16" type="text/javascript"></script> <script src="js/global.js?v=ac30d16" type="text/javascript"></script>
<script src="js/defaults.js?v=5b06818" type="text/javascript"></script> <script src="js/defaults.js?v=5b06818" type="text/javascript"></script>
<script src="js/extensions.js?v=1fca0fc" type="text/javascript"></script> <script src="js/extensions.js?v=0bd1fbe" type="text/javascript"></script>
<!-- Base Libs --> <!-- Base Libs -->
<script src="js/lib/util.js?v=379aef7" type="text/javascript"></script> <script src="js/lib/util.js?v=379aef7" type="text/javascript"></script>
@ -539,7 +539,7 @@
<!-- Content --> <!-- Content -->
<script src="js/prompt.js?v=7a1c68c" type="text/javascript"></script> <script src="js/prompt.js?v=7a1c68c" type="text/javascript"></script>
<script src="js/index.js?v=7debf82" type="text/javascript"></script> <script src="js/index.js?v=c6b95a9" type="text/javascript"></script>
<script <script
src="js/ui/floating/history.js?v=4f29db4" src="js/ui/floating/history.js?v=4f29db4"
@ -553,7 +553,7 @@
src="js/ui/tool/generic.js?v=3e678e0" src="js/ui/tool/generic.js?v=3e678e0"
type="text/javascript"></script> type="text/javascript"></script>
<script src="js/ui/tool/dream.js?v=06e0164" type="text/javascript"></script> <script src="js/ui/tool/dream.js?v=1bbd3fe" type="text/javascript"></script>
<script <script
src="js/ui/tool/maskbrush.js?v=e9bd0eb" src="js/ui/tool/maskbrush.js?v=e9bd0eb"
type="text/javascript"></script> type="text/javascript"></script>

64
js/extensions.js
View file

@ -89,40 +89,42 @@ const extensions = {
) { ) {
var url = document.getElementById("host").value + "/controlnet/version"; var url = document.getElementById("host").value + "/controlnet/version";
try { if (
const response = await fetch(url); this.enabledExtensions.filter((e) => e.includes("controlnet")).length > 0
const data = await response.json(); ) {
if (
data.version > 0 &&
this.enabledExtensions.filter((e) => e.includes("controlnet")).length >
0
) {
// ControlNet found
this.alwaysOnScripts = true;
this.controlNetEnabled = true;
document.getElementById("cbxControlNet").disabled = false;
// ok cool so now we can get the models and modules
this.getModels(controlNetModelAutoComplete);
this.getModules(
controlNetModuleAutoComplete,
controlNetReferenceModuleAutoComplete
);
}
url = document.getElementById("host").value + "/controlnet/settings";
try { try {
const response2 = await fetch(url); const response = await fetch(url);
const data2 = await response2.json(); const data = await response.json();
if (data2.control_net_max_models_num < 2) {
document.getElementById("cbxControlNetReferenceLayer").disabled = if (data.version > 0) {
"disabled"; // ControlNet found
console.warn( this.alwaysOnScripts = true;
"[extensions] ControlNet reference layer disabled due to insufficient units enabled in settings - cannot be enabled via API, please increase to at least 2 units manually" this.controlNetEnabled = true;
document.getElementById("cbxControlNet").disabled = false;
// ok cool so now we can get the models and modules
this.getModels(controlNetModelAutoComplete);
this.getModules(
controlNetModuleAutoComplete,
controlNetReferenceModuleAutoComplete
); );
} }
} catch (ex) {} url = document.getElementById("host").value + "/controlnet/settings";
} catch (e) { try {
// ?? const response2 = await fetch(url);
const data2 = await response2.json();
if (data2.control_net_max_models_num < 2) {
document.getElementById("cbxControlNetReferenceLayer").disabled =
"disabled";
console.warn(
"[extensions] ControlNet reference layer disabled due to insufficient units enabled in settings - cannot be enabled via API, please increase to at least 2 units manually"
);
}
} catch (ex) {}
} catch (e) {
// ??
global.controlnetAPI = false;
}
} else {
global.controlnetAPI = false; global.controlnetAPI = false;
} }
}, },

3
js/index.js
View file

@ -888,13 +888,14 @@ function changeControlNetExtension() {
.querySelectorAll(".controlNetElement") .querySelectorAll(".controlNetElement")
.forEach((el) => el.classList.add("invisible")); .forEach((el) => el.classList.add("invisible"));
} }
changeControlNetReference();
} }
function changeControlNetReference() { function changeControlNetReference() {
extensions.controlNetReferenceActive = document.getElementById( extensions.controlNetReferenceActive = document.getElementById(
"cbxControlNetReferenceLayer" "cbxControlNetReferenceLayer"
).checked; ).checked;
if (extensions.controlNetReferenceActive) { if (extensions.controlNetReferenceActive && extensions.controlNetActive) {
document document
.querySelectorAll(".controlNetReferenceElement") .querySelectorAll(".controlNetReferenceElement")
.forEach((el) => el.classList.remove("invisible")); .forEach((el) => el.classList.remove("invisible"));