From 02e1cdddac98d3b8d879bf6c086c1a58b69a9337 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Sat, 25 Sep 2021 09:33:27 -0400 Subject: [PATCH] Sort objects by name, not size Also switches to using localeCompare --- macrovision.js | 7 +++++-- presets/objects.js | 10 ---------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/macrovision.js b/macrovision.js index faeccafd..48c8933a 100644 --- a/macrovision.js +++ b/macrovision.js @@ -3859,10 +3859,13 @@ function prepareEntities() { }) availableEntities["characters"].sort((x, y) => { - return x.name.toLowerCase() < y.name.toLowerCase() ? -1 : 1 + return x.name.localeCompare(y.name) }); availableEntities["species"].sort((x, y) => { - return x.name.toLowerCase() < y.name.toLowerCase() ? -1 : 1 + return x.name.localeCompare(y.name) + }); + availableEntities["objects"].sort((x, y) => { + return x.name.localeCompare(y.name) }); const holder = document.querySelector("#spawners"); const filterHolder = document.querySelector("#filters"); diff --git a/presets/objects.js b/presets/objects.js index ac862d61..2ad261b7 100644 --- a/presets/objects.js +++ b/presets/objects.js @@ -775,15 +775,5 @@ function makeObjects() { console.log(results[results.length - 1]) - - - - results.sort((b1, b2) => { - e1 = b1.constructor(); - e2 = b2.constructor(); - return -math.subtract(e1.views[e1.defaultView].height, e2.views[e2.defaultView].height).value; - }); - - return results; }