small controlnet ui quirks corrected

zero01101 · Jul 22, 2023 · e853b9f · e853b9f
1 parent e04dd2e
commit e853b9f
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 38 deletions.
diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en-US">
 	<head>
 		<meta charset="utf-8" />
@@ -315,8 +315,8 @@
 					<br />
 					<span id="version">
 						<a href="https://github.com/zero01101/openOutpaint" target="_blank">
-							<s>Alpha release v0.0.16.3</s>
-							v20230715.002
+							<s>Alpha release v0.0.16.4</s>
+							v20230722.001
 						</a>
 						<br />
 						<a
@@ -513,7 +513,7 @@
 		<!-- Basics -->
 		<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/extensions.js?v=1fca0fc" type="text/javascript"></script>
+		<script src="js/extensions.js?v=0bd1fbe" type="text/javascript"></script>
 
 		<!-- Base Libs -->
 		<script src="js/lib/util.js?v=379aef7" type="text/javascript"></script>
@@ -539,7 +539,7 @@
 
 		<!-- Content -->
 		<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
 			src="js/ui/floating/history.js?v=4f29db4"
@@ -553,7 +553,7 @@
 			src="js/ui/tool/generic.js?v=3e678e0"
 			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
 			src="js/ui/tool/maskbrush.js?v=e9bd0eb"
 			type="text/javascript"></script>

diff --git a/js/extensions.js b/js/extensions.js
@@ -89,40 +89,42 @@ const extensions = {
 	) {
 		var url = document.getElementById("host").value + "/controlnet/version";
 
-		try {
-			const response = await fetch(url);
-			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";
+		if (
+			this.enabledExtensions.filter((e) => e.includes("controlnet")).length > 0
+		) {
 			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"
+				const response = await fetch(url);
+				const data = await response.json();
+
+				if (data.version > 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
 					);
 				}
-			} catch (ex) {}
-		} catch (e) {
-			// ??
+				url = document.getElementById("host").value + "/controlnet/settings";
+				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;
 		}
 	},

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