diff --git a/Libraries/Param_Helpers.js b/Libraries/Param_Helpers.js index 6d058931..d43bdde9 100644 --- a/Libraries/Param_Helpers.js +++ b/Libraries/Param_Helpers.js @@ -92,9 +92,9 @@ function param_to_string(value) // Return formatted text for param download function get_param_download_text(params) { - // Sort alphabetically, localeCompare does underscores differently to built in sort + // Natural sort to match MAVProxy and Mission Planner param file ordering const keys = Object.keys(params).sort((a, b) => - a.localeCompare(b) + a.localeCompare(b, undefined, {numeric: true}) ) let text = "" diff --git a/LogFinder/LogFinder.js b/LogFinder/LogFinder.js index 5e5b0eda..b1587848 100644 --- a/LogFinder/LogFinder.js +++ b/LogFinder/LogFinder.js @@ -386,7 +386,7 @@ function setup_table(logs) { // Sort alphabetically, localeCompare does underscores differently to built in sort function param_sort(a, b) { - return a.localeCompare(b) + return a.localeCompare(b, undefined, {numeric: true}) } if (Object.keys(diff.added).length > 0) {