monitors move to comfyui-menu-push

crystian · Sep 24, 2024 · 23028b1 · 23028b1
1 parent c05f5bf
commit 23028b1
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 18 deletions.
diff --git a/__init__.py b/__init__.py
@@ -2,7 +2,7 @@
 @author: Crystian
 @title: Crystools
 @nickname: Crystools
-@version: 1.18.2
+@version: 1.18.3
 @project: "https://github.com/crystian/ComfyUI-Crystools",
 @description: Plugins for multiples uses, mainly for debugging, you need them! IG: https://www.instagram.com/crystian.ia
 """

diff --git a/core/version.py b/core/version.py
@@ -1 +1 @@
-version = "1.18.2"
+version = "1.18.3"
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-crystools"
 description = "With this suit, you can see the resources monitor, progress bar & time elapsed, metadata and compare between two images, compare between two JSONs, show any value to console/display, pipes, and more!\nThis provides better nodes to load/save images, previews, etc, and see \"hidden\" data without loading a new workflow."
-version = "1.18.2"
+version = "1.18.3"
 license = { file = "LICENSE" }
 dependencies = ["deepdiff", "torch", "numpy", "Pillow", "pynvml", "py-cpuinfo"]
 

diff --git a/version b/version
@@ -1 +1 @@
-1.18.2
+1.18.3
diff --git a/web/monitor.js b/web/monitor.js
@@ -509,21 +509,27 @@ class CrystoolsMonitor {
                         if (document.getElementById('ProgressBarUI')) {
                             document.getElementById('ProgressBarUI').style.display = 'flex';
                         }
+                        if (parentElement && this.monitorUI.htmlRoot) {
+                            parentElement.insertAdjacentElement('afterend', this.monitorUI.htmlRoot);
+                        }
+                        else {
+                            console.error('Crystools: parentElement to move monitors not found!', parentElement);
+                        }
                         break;
                     case NewMenuOptions.Top:
                     case NewMenuOptions.Bottom:
                         if (document.getElementById('ProgressBarUI')) {
                             document.getElementById('ProgressBarUI').style.display = 'none';
                         }
                         parentElement = document.getElementsByClassName('comfyui-menu-push')[0];
+                        if (parentElement && this.monitorUI.htmlRoot) {
+                            parentElement.appendChild(this.monitorUI.htmlRoot);
+                        }
+                        else {
+                            console.error('Crystools: parentElement to move monitors not found!', parentElement);
+                        }
                         break;
                 }
-                if (parentElement && this.monitorUI.htmlRoot) {
-                    parentElement.insertAdjacentElement('afterend', this.monitorUI.htmlRoot);
-                }
-                else {
-                    console.error('Crystools: parentElement to move monitors not found!', parentElement);
-                }
             }
         });
         Object.defineProperty(this, "updateAllWidget", {

diff --git a/web/monitor.ts b/web/monitor.ts
@@ -404,6 +404,7 @@ class CrystoolsMonitor {
     });
   };
 
+  // eslint-disable-next-line complexity
   moveMonitor = (position: NewMenuOptions): void => {
     let parentElement: Element | null | undefined;
 
@@ -416,7 +417,13 @@ class CrystoolsMonitor {
           document.getElementById('ProgressBarUI').style.display = 'flex';
 
         }
+        if (parentElement && this.monitorUI.htmlRoot) {
+          parentElement.insertAdjacentElement('afterend', this.monitorUI.htmlRoot);
+        } else {
+          console.error('Crystools: parentElement to move monitors not found!', parentElement);
+        }
         break;
+
       case NewMenuOptions.Top:
       case NewMenuOptions.Bottom:
         // TODO remove this
@@ -425,17 +432,15 @@ class CrystoolsMonitor {
           document.getElementById('ProgressBarUI').style.display = 'none';
         }
         parentElement = document.getElementsByClassName('comfyui-menu-push')[0];
+
+        if (parentElement && this.monitorUI.htmlRoot) {
+          parentElement.appendChild(this.monitorUI.htmlRoot);
+        } else {
+          console.error('Crystools: parentElement to move monitors not found!', parentElement);
+        }
         break;
     }
 
-    if (parentElement && this.monitorUI.htmlRoot) {
-      // console.log('moveMonitor1', parentElement);
-      // console.log('moveMonitor2', this.monitorUI.htmlRoot);
-      parentElement.insertAdjacentElement('afterend', this.monitorUI.htmlRoot);
-
-    } else {
-      console.error('Crystools: parentElement to move monitors not found!', parentElement);
-    }
 
   };