diff --git a/dist/CNC/GRBL/index.html.gz b/dist/CNC/GRBL/index.html.gz index 4a1fbcb1..85f0f8d6 100644 Binary files a/dist/CNC/GRBL/index.html.gz and b/dist/CNC/GRBL/index.html.gz differ diff --git a/dist/CNC/GRBLHal/index.html.gz b/dist/CNC/GRBLHal/index.html.gz index d0d9f058..1f3f88e1 100644 Binary files a/dist/CNC/GRBLHal/index.html.gz and b/dist/CNC/GRBLHal/index.html.gz differ diff --git a/dist/Plotter/HP-GL/index.html.gz b/dist/Plotter/HP-GL/index.html.gz index 0e101bb6..54b00f63 100644 Binary files a/dist/Plotter/HP-GL/index.html.gz and b/dist/Plotter/HP-GL/index.html.gz differ diff --git a/dist/Printer3D/Marlin-embedded/index.html.gz b/dist/Printer3D/Marlin-embedded/index.html.gz index d3713479..20f8c783 100644 Binary files a/dist/Printer3D/Marlin-embedded/index.html.gz and b/dist/Printer3D/Marlin-embedded/index.html.gz differ diff --git a/dist/Printer3D/Marlin/index.html.gz b/dist/Printer3D/Marlin/index.html.gz index 15e233bd..23de4c78 100644 Binary files a/dist/Printer3D/Marlin/index.html.gz and b/dist/Printer3D/Marlin/index.html.gz differ diff --git a/dist/Printer3D/Repetier/index.html.gz b/dist/Printer3D/Repetier/index.html.gz index 45906487..052e6ed8 100644 Binary files a/dist/Printer3D/Repetier/index.html.gz and b/dist/Printer3D/Repetier/index.html.gz differ diff --git a/dist/Printer3D/Smoothieware/index.html.gz b/dist/Printer3D/Smoothieware/index.html.gz index cedd4a34..607936f1 100644 Binary files a/dist/Printer3D/Smoothieware/index.html.gz and b/dist/Printer3D/Smoothieware/index.html.gz differ diff --git a/dist/SandTable/GRBL/index.html.gz b/dist/SandTable/GRBL/index.html.gz index 6048b4aa..2064f1ae 100644 Binary files a/dist/SandTable/GRBL/index.html.gz and b/dist/SandTable/GRBL/index.html.gz differ diff --git a/src/components/App/version.js b/src/components/App/version.js index cdf0b26d..529e7828 100644 --- 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-a72" +export const webUIversion = "3.0.0-a73" export const Esp3dVersion = () => ( {webUIversion}.{webUIbuild} diff --git a/src/targets/Printer3D/Marlin/SDEXT-source.js b/src/targets/Printer3D/Marlin/SDEXT-source.js index 5a5f0ced..18a7db3b 100644 --- a/src/targets/Printer3D/Marlin/SDEXT-source.js +++ b/src/targets/Printer3D/Marlin/SDEXT-source.js @@ -113,15 +113,17 @@ const commands = { }, formatResult: (result) => { const files = formatFileSerialLine(result.content) - const isSorted = useUiContextFn.getValue("filessorted") + const isSorted = useUiContextFn.getValue("sort_sd_files") return { files: isSorted? sortedFilesList(files, false) : files, status: formatStatus(result.status), } }, filterResult: (data, path) => { + //console.log(data) + const isSorted = useUiContextFn.getValue("sort_sd_files") const res = {} - res.files = isSorted? sortedFilesList(filterResultFiles(data.files, path), false) : data.files + res.files = isSorted? sortedFilesList(filterResultFiles(data.files, path), false) : filterResultFiles(data.files, path) res.status = formatStatus(data.status) return res },