Use new version of tinysort in multiple_select

Simrayz · Simrayz · commit 27014b1f4376 · 2025-10-09T11:03:07.000+02:00
diff --git a/python/nav/web/static/js/require_config.js b/python/nav/web/static/js/require_config.js
@@ -22,7 +22,8 @@ var require = {
         "underscore": "libs/underscore",
         "marionette": "libs/backbone.marionette.min",
         "vue": "libs/vue.min",
-        "driver": "libs/driver-1.3.6.min"
+        "driver": "libs/driver-1.3.6.min",
+        "tinysort": "libs/tinysort-3.1.4.min",
     },
     shim: {
         'libs/jquery-ui-timepicker-addon': ['libs/jquery-ui.min'],
diff --git a/python/nav/web/static/js/src/plugins/multiple_select.js b/python/nav/web/static/js/src/plugins/multiple_select.js
@@ -1,4 +1,4 @@
-define(['libs/jquery.tinysort'], function () {
+define(['tinysort'], function (tinysort) {
 
     /**
      * MultipleSelect - an alternative to QuickSelect
@@ -90,13 +90,21 @@ define(['libs/jquery.tinysort'], function () {
         },
         sortInitial: function () {
             this.findInitialOptions();
-            this.initial.sort(this.compareElements);
-            this.initial.detach().appendTo(this.initialNode);
+            const initialOptions = Array.from(this.initialNode[0].options);
+            const sortedOptions = tinysort(initialOptions, {selector: null, order: 'asc', natural: true});
+            this.initialNode.empty();
+            for (const option of sortedOptions) {
+                this.initialNode[0].appendChild(option);
+            }
         },
         sortChoices: function () {
             this.findChoiceOptions();
-            this.choices.sort(this.compareElements);
-            this.choices.detach().appendTo(this.choiceNode);
+            const choiceOptions = Array.from(this.choiceNode[0].options);
+            const sortedOptions = tinysort(choiceOptions, {selector: null, order: 'asc', natural: true});
+            this.choiceNode.empty();
+            for (const option of sortedOptions) {
+                this.choiceNode[0].appendChild(option);
+            }
         },
         addSubmitHandler: function () {
             /* Selects all elements in the initial node so that it is
