Fix typo on extra SD due to #396 thanks to DaKoarli for raising it

luc-github · Aug 12, 2024 · 72742a9 · 72742a9
1 parent aedeff9
commit 72742a9
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 3 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-a72"
+export const webUIversion = "3.0.0-a73"
 export const Esp3dVersion = () => (
     <span>
         {webUIversion}.{webUIbuild}

diff --git 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
     },