From 7a598a439a9393f8f8f1054b562492f3d8d5f187 Mon Sep 17 00:00:00 2001
From: Cal <cal@clockworkcaracal.com>
Date: Wed, 9 Oct 2024 15:09:30 -0600
Subject: [PATCH] switch to custom sort comparitor

---
 public/scripts/variables.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/public/scripts/variables.js b/public/scripts/variables.js
index 343af9b16..c971ef830 100644
--- a/public/scripts/variables.js
+++ b/public/scripts/variables.js
@@ -836,6 +836,14 @@ function randValuesCallback(from, to, args) {
     return value;
 }
 
+function customSortComparitor(a, b) {
+    if (typeof a != typeof b) {
+        a = typeof a;
+        b = typeof b;
+    }
+    return a > b ? 1 : a < b ? -1 : 0;
+}
+
 function sortArrayObjectCallback(args, value) {
     let parsedValue;
     if (typeof value == 'string') {
@@ -850,13 +858,13 @@ function sortArrayObjectCallback(args, value) {
     }
     if (Array.isArray(parsedValue)) {
         // always sort lists by value
-        parsedValue.sort()
+        parsedValue.sort(customSortComparitor)
     } else if (typeof parsedValue == 'object') {
         let keysort = args.keysort;
         if (isFalseBoolean(keysort)) {
-            parsedValue = Object.keys(parsedValue).sort(function(a,b){return parsedValue[a]-parsedValue[b]});
+            parsedValue = Object.keys(parsedValue).sort(function(a,b){return customSortComparitor(parsedValue[a], parsedValue[b])});
         } else {
-            parsedValue = Object.keys(parsedValue).sort();
+            parsedValue = Object.keys(parsedValue).sort(customSortComparitor);
         }
     }
     return JSON.stringify(parsedValue);