Merge branch 'main' into testing

.devtools/updatehashes.sh

@@ -94,11 +94,18 @@ do
 done
 
 # Actual file processing
-for htmlfile in $(find -type f -name \*.html)
+for htmlfile in $(find -type f -name \*.html -not -path "./node_modules/*")
 do
     echo -e "${BIBlue}[info] Processing '${htmlfile}' for cache busting...${Color_Off}"
     
-    for resourcefile in $(find -type f -regex '.*\.css\|.*\.js' | sed 's/\.\///g')
+    LIST=$(find -type f -regex '.*\.css\|.*\.js' -not -path "./node_modules/*" | sed 's/\.\///g')
+
+    if [ "$1" = "gitadd" ]
+    then
+        LIST=$(git status -s | grep -oE "[A-Z]  .+" | cut -d" " -f3)
+    fi
+
+    for resourcefile in $LIST
     do
         # Check if resource is used in html file
         resourceusage=$(grep -i "$resourcefile" "$htmlfile")

.githooks/pre-commit

@@ -3,7 +3,7 @@
 # Script to perform some basic operations to the code before committing.
 
 # Adds file hashes to html script imports for cache busting purposes
-sh .devtools/updatehashes.sh
+sh .devtools/updatehashes.sh gitadd
 
 # Adds file to current commit
-git add --all
+git add "**.html"

README.md

@@ -54,6 +54,14 @@ A1111 webUI must be launched with the `--api` flag enabled, and the `--cors-allo
 
 **_NOTE: the commandline flag `--gradio-debug` disables custom API routes and completely breaks openOutpaint. please remove it from your COMMANDLINE_ARGS before running openOutpaint._**
 
+### surprising incompatibilities
+
+If anything goes wrong with openOutpaint, try running it on another browser and disable all extensions and try again. If a new incompatible extension is found, please open an issue so we can notify other users of extension incompatibilities.
+
+- [microsoft editor extension for chrome/edge seems to disable the overmask slider](https://github.com/zero01101/openOutpaint/discussions/88#discussioncomment-4498341)
+- [duckduckgo privacy extension for firefox breaks outpainting, resulting in pure black output](https://github.com/zero01101/openOutpaint-webUI-extension/issues/3#issuecomment-1367694000) - add an exception for your openOutpaint host (likely localhost or 127.0.0.1)
+- [same for dark reader](https://github.com/zero01101/openOutpaint-webUI-extension/issues/3#issuecomment-1367838766)
+
 ### quickstart speedrun
 
 1. edit your `cors-allow-origins` to include https://zero01101.github.io and run webUI

index.html

@@ -316,7 +316,7 @@
 		<script src="js/global.js?v=3da0b2e" type="text/javascript"></script>
 
 		<!-- Base Libs -->
-		<script src="js/lib/util.js?v=1ae75ef" type="text/javascript"></script>
+		<script src="js/lib/util.js?v=7f6847c" type="text/javascript"></script>
 		<script src="js/lib/events.js?v=2ab7933" type="text/javascript"></script>
 		<script src="js/lib/input.js?v=09298ac" type="text/javascript"></script>
 		<script src="js/lib/layers.js?v=a1f8aea" type="text/javascript"></script>
@@ -345,7 +345,7 @@
 
 		<!-- Load Tools -->
 		<script
-			src="js/ui/tool/generic.js?v=e45f721"
+			src="js/ui/tool/generic.js?v=2bcd36d"
 			type="text/javascript"></script>
 
 		<script src="js/ui/tool/dream.js?v=230e42e" type="text/javascript"></script>

js/lib/util.js

@@ -140,10 +140,13 @@ class DOM {
 	 * @returns Whether there is currently an active input
 	 */
 	static hasActiveInput() {
-		return (
+		const active = document.activeElement;
-			document.activeElement &&
+		const tag = active.tagName.toLowerCase();
-			this.inputTags.has(document.activeElement.tagName.toLowerCase())
+
-		);
+		const checkTag = this.inputTags.has(tag);
+		if (!checkTag) return false;
+
+		return tag !== "input" || active.type === "text";
 	}
 }
 

js/ui/explore.js

@@ -1,3 +0,0 @@
-/**
- * This is a simple implementation of layer interaction
- */

js/ui/tool/generic.js

@@ -35,10 +35,10 @@ const _tool = {
 
 		uiCtx.save();
 
-		// draw targeting square reticle thingy cursor
+		// Draw targeting square reticle thingy cursor
 		uiCtx.lineWidth = style.reticleWidth;
 		uiCtx.strokeStyle = style.reticleStyle;
-		uiCtx.strokeRect(bbvp.x, bbvp.y, bbvp.w, bbvp.h); //origin is middle of the frame
+		uiCtx.strokeRect(bbvp.x, bbvp.y, bbvp.w, bbvp.h); // Origin is middle of the frame
 
 		uiCtx.font = `bold 20px Open Sans`;