Remove debug

Add missing ref Bump version Rebuild package
luc-github · Jun 27, 2024 · 5452a06 · 5452a06
1 parent f77d421
commit 5452a06
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 15 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-a67"
+export const webUIversion = "3.0.0-a68"
 export const Esp3dVersion = () => (
     <span>
         {webUIversion}.{webUIbuild}

diff --git a/src/components/ExtraContent/index.js b/src/components/ExtraContent/index.js
@@ -255,7 +255,7 @@ const ExtraContent = ({
                     <Fragment>
                         <span class="m-1" />
                         <FullScreenButton
-                            panelRef={element}
+                            panelRef={panelRef}
                             hideOnFullScreen={true}
                             asButton={true}
                         />
@@ -326,10 +326,11 @@ const ExtraContent = ({
     })
     if (target == "page")
         return (
-            <Fragment>
+            <div id={"page_"+id} ref={panelRef} style="height: 100%">
+             <ContainerHelper id={"page_"+id} /> 
                 <MainContent />
                 <ControlButtons />
-            </Fragment>
+            </div>
         )
     if (target == "panel") {
         const displayIcon = iconsList[icon] ? iconsList[icon] : ""

diff --git a/src/hooks/useSettings.js b/src/hooks/useSettings.js
@@ -201,7 +201,7 @@ const useSettings = () => {
                         connectionSettings.current.Screen = "none"
                     }
                     processData("core", "ESP800", true)
-                    console.log(connectionSettings.current)
+                    //console.log(connectionSettings.current)
                     document.title = connectionSettings.current.Hostname
                     if (
                         !connectionSettings.current.HostPath ||
@@ -326,7 +326,7 @@ const useSettings = () => {
             if (elem) elem.parentNode.removeChild(elem)
 
             if (themepack != "default") {
-                console.log("Loading theme: " + themepack)
+                //console.log("Loading theme: " + themepack)
                 createNewRequest(
                     espHttpURL(
                         useSettingsContextFn.getValue("HostDownloadPath") +
@@ -380,15 +380,15 @@ const useSettings = () => {
                 onSuccess: (result) => {
                     const jsonResult = JSON.parse(result)
 
-                    console.log("preferences.json")
-                    console.log(jsonResult)
+                    //console.log("preferences.json")
+                    //console.log(jsonResult)
                     const [preferences_settings, haserrors] = importPreferencesSection(
                         defaultPreferences.settings,
                         jsonResult.settings
                     )
-                    console.log("Format preferences.settings")
+                    //console.log("Format preferences.settings")
                     formatPreferences(preferences_settings)
-                    console.log(preferences_settings)
+                    //console.log(preferences_settings)
                     uisettings.set(
                         JSON.parse(JSON.stringify(preferences_settings))
                     )
@@ -411,8 +411,8 @@ const useSettings = () => {
                     if (jsonResult.extensions) {
                         interfaceSettings.current.extensions = jsonResult.extensions
                     }
-                    console.log("interfaceSettings.current")
-                    console.log(interfaceSettings.current)
+                    //console.log("interfaceSettings.current")
+                    //console.log(interfaceSettings.current)
 
                     //Mobile view
                     if (uisettings.getValue("mobileview", preferences_settings))

diff --git a/src/pages/dashboard/index.js b/src/pages/dashboard/index.js
@@ -186,13 +186,13 @@ const Dashboard = () => {
 
     useEffect(() => {
         if (!intialisationDone) {
-            console.log("Init")
+            //console.log("Init")
             intialisationDone = true
-            console.log(uisettings.getValue("enableshortcuts"))
+            //console.log(uisettings.getValue("enableshortcuts"))
             setIsKeyboardEnabled(uisettings.getValue("enableshortcuts"))
             shortcuts.enable(uisettings.getValue("enableshortcuts"))
         } else {
-            console.log("Init Done")
+            //console.log("Init Done")
         }
     }, [])