Skip to content

Commit 3e0e7d1

Browse files
committed
Fix autorefresh ignored in extra content
Bump version Build package
1 parent 046b037 commit 3e0e7d1

File tree

9 files changed

+7
-6
lines changed

9 files changed

+7
-6
lines changed

dist/CNC/GRBL/index.html.gz

223 Bytes
Binary file not shown.

dist/CNC/GRBLHal/index.html.gz

215 Bytes
Binary file not shown.
212 Bytes
Binary file not shown.
210 Bytes
Binary file not shown.
209 Bytes
Binary file not shown.
215 Bytes
Binary file not shown.

dist/SandTable/GRBL/index.html.gz

216 Bytes
Binary file not shown.

src/components/App/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
import { h } from "preact"
1919
import { webUIbuild } from "../../targets"
20-
export const webUIversion = "3.0.0-2b1"
20+
export const webUIversion = "3.0.0-3b1"
2121
export const Esp3dVersion = () => (
2222
<span>
2323
{webUIversion}.{webUIbuild}

src/components/ExtraContent/extraContentItem.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ const ExtraContentItem = ({
100100
}
101101

102102
if (isPaused || !visibilityState[id] || (target=="panel" && !useUiContextFn.panels.isVisible(elementsCache.getRootfromId(id)))) {
103-
// console.log("Not loading content for " + id + " because it is paused or not visible")
103+
//console.log("Not loading content for " + id + " because it is paused or not visible")
104104
return
105105
}
106106
//console.log("Loading content for " + id)
@@ -110,7 +110,8 @@ const ExtraContentItem = ({
110110
setIsLoading(false)
111111
isLoadedState[id] = true
112112
} else {
113-
if (isLoadedState[id]){
113+
if (isLoadedState[id] && !refreshIntervalRef.current){
114+
//console.log("Already loaded")
114115
return
115116
}
116117
setIsLoading(true)
@@ -192,15 +193,15 @@ const ExtraContentItem = ({
192193

193194
useEffect(() => {
194195
if (refreshtime > 0 && (type === "camera" || type === "image") && visibilityState[id] && !isPaused) {
195-
console.log("Updating refresh interval for " + id)
196+
//console.log("Updating refresh interval for " + id)
196197
if (!refreshIntervalRef.current){
197-
console.log("Starting refresh interval for " + id+ " with refreshtime " + refreshtime)
198+
//console.log("Starting refresh interval for " + id+ " with refreshtime " + refreshtime)
198199
refreshIntervalRef.current = setInterval(loadContent, refreshtime)
199200
}
200201
}
201202
return () => {
202203
if (refreshIntervalRef.current) {
203-
console.log("Stopping refresh interval for " + id)
204+
//console.log("Stopping refresh interval for " + id)
204205
clearInterval(refreshIntervalRef.current)
205206
refreshIntervalRef.current = null
206207
}

0 commit comments

Comments
 (0)