From 7f81e9c07edb381105d5ff1d2c88fd0be6cc6647 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sun, 2 Sep 2018 21:29:41 +0800
Subject: [PATCH] change the sorting method of rpc name to natural sorting

---
 package.json                                 | 1 +
 src/index.html                               | 1 +
 src/scripts/services/ariaNgSettingService.js | 8 +-------
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index f507b3e..2bfa6c5 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "awesome-bootstrap-checkbox": "^0.3.7",
     "jquery-slimscroll": "^1.3.8",
     "bootstrap-contextmenu": "^1.0.0",
+    "natural-compare": "1.4.0",
     "angular": "1.6.10",
     "angular-route": "1.6.10",
     "angular-sanitize": "1.6.10",
diff --git a/src/index.html b/src/index.html
index 5866389..c6a86a6 100644
--- a/src/index.html
+++ b/src/index.html
@@ -329,6 +329,7 @@
 <script src="../node_modules/jquery-slimscroll/jquery.slimscroll.min.js"></script>
 <script src="../node_modules/sweetalert/dist/sweetalert.min.js"></script>
 <script src="../node_modules/bootstrap-contextmenu/bootstrap-contextmenu.js"></script>
+<script src="../node_modules/natural-compare/index.js"></script>
 <script src="../node_modules/angular-translate/dist/angular-translate.min.js"></script>
 <script src="../node_modules/angular-moment/angular-moment.min.js"></script>
 <script src="../node_modules/angular-websocket/dist/angular-websocket.min.js"></script>
diff --git a/src/scripts/services/ariaNgSettingService.js b/src/scripts/services/ariaNgSettingService.js
index ba0cf94..5fbb84a 100644
--- a/src/scripts/services/ariaNgSettingService.js
+++ b/src/scripts/services/ariaNgSettingService.js
@@ -245,13 +245,7 @@
                     // Do Nothing
                 } else if (displayOrder === 'rpcAlias') {
                     result.sort(function (rpc1, rpc2) {
-                        if (rpc1.rpcAlias < rpc2.rpcAlias) {
-                            return -1;
-                        } else if (rpc1.rpcAlias > rpc2.rpcAlias) {
-                            return 1;
-                        } else {
-                            return 0;
-                        }
+                        return String.naturalCompare(rpc1.rpcAlias, rpc2.rpcAlias);
                     });
                 }