Fix typo in status panel that make it crash

Add sanity check if extension has no body
luc-github · Aug 15, 2024 · 16ce347 · 16ce347
1 parent 72742a9
commit 16ce347
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 4 deletions.
diff --git a/dist/CNC/GRBL/index.html.gz b/dist/CNC/GRBL/index.html.gz
diff --git a/dist/CNC/GRBLHal/index.html.gz b/dist/CNC/GRBLHal/index.html.gz
diff --git a/dist/Plotter/HP-GL/index.html.gz b/dist/Plotter/HP-GL/index.html.gz
diff --git a/dist/Printer3D/Marlin-embedded/index.html.gz b/dist/Printer3D/Marlin-embedded/index.html.gz
diff --git a/dist/Printer3D/Marlin/index.html.gz b/dist/Printer3D/Marlin/index.html.gz
diff --git a/dist/Printer3D/Repetier/index.html.gz b/dist/Printer3D/Repetier/index.html.gz
diff --git a/dist/Printer3D/Smoothieware/index.html.gz b/dist/Printer3D/Smoothieware/index.html.gz
diff --git a/dist/SandTable/GRBL/index.html.gz b/dist/SandTable/GRBL/index.html.gz
diff --git a/src/components/App/version.js b/src/components/App/version.js
@@ -17,7 +17,7 @@
 */
 import { h } from "preact"
 import { webUIbuild } from "../../targets"
-export const webUIversion = "3.0.0-a73"
+export const webUIversion = "3.0.0-a74"
 export const Esp3dVersion = () => (
     <span>
         {webUIversion}.{webUIbuild}

diff --git a/src/components/ExtraContent/extraContentItem.js b/src/components/ExtraContent/extraContentItem.js
@@ -175,8 +175,8 @@ const ExtraContentItem = ({
     }, [id, loadContent])
 
     useEffect(() => {
-        console.log("Updating refresh interval for " + id)
         if (refreshtime > 0 && (type === "camera" || type === "image") && visibilityState[id] && !isPaused) {
+            console.log("Updating refresh interval for " + id)
             if (!refreshIntervalRef.current){
                 console.log("Starting refresh interval for " + id+ " with refreshtime " + refreshtime)
                 refreshIntervalRef.current = setInterval(loadContent, refreshtime)
@@ -207,6 +207,10 @@ const ExtraContentItem = ({
 
             const doc = iframeElement.contentWindow.document
             const body = doc.querySelector("body")
+            if (!body){
+                console.error("body not found")
+                return
+            } 
             body.classList.add("body-extension")
             const css = document.querySelectorAll("style")
             css.forEach((csstag) => {

diff --git a/src/components/Panels/Status.js b/src/components/Panels/Status.js
@@ -142,8 +142,7 @@ const StatusControls = () => {
                             </div>
                         )}
                         {status.printState.printing &&
-                            status.printState.progress !=
-                                "NaN"(
+                            status.printState.progress != "NaN" && (
                                     <Fragment>
                                         <div class="extra-control-value">
                                             {status.printState.progress}%