検索ロジック改善

TeamKun · Sep 25, 2022 · 530dcf3 · 530dcf3
1 parent d24ba79
commit 530dcf3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/app/assets/js/scripts/overlay.js b/app/assets/js/scripts/overlay.js
@@ -172,13 +172,13 @@ function setDismissHandler(handler) {
 
 document.getElementById('serverSelectConfirm').addEventListener('click', () => {
     const listings = document.getElementsByClassName('serverListing')
+    document.getElementById('filterInput').value = ''
     for (let i = 0; i < listings.length; i++) {
         if (listings[i].hasAttribute('selected')) {
             const serv = DistroManager.getDistribution().getServer(listings[i].getAttribute('servid'))
             updateSelectedServer(serv)
             refreshServerStatus(true)
             toggleOverlay(false)
-            document.getElementById('filterInput').value = ''
             return
         }
     }
@@ -227,15 +227,15 @@ document.getElementById('accountSelectCancel').addEventListener('click', () => {
 })
 
 document.getElementById('filterInput').addEventListener('input', (e) => {
-    let value = document.getElementById('filterInput').value
+    let value = Util.kanaToHira(document.getElementById('filterInput').value.toLowerCase())
     const distro = DistroManager.getDistribution()
     const servers = distro.getServers()
 
     let searchedList = []
 
     servers.forEach((server) => {
-        let reg = new RegExp(`^${value}`, 'i')
-        if (reg.test(getServerName(server.getName()))) {
+        let serverName = Util.kanaToHira(getServerName(server.getName()).toLowerCase())
+        if (serverName.indexOf(value) >= 0) {
             searchedList.push(server)
         }
     })

diff --git a/app/assets/js/util.js b/app/assets/js/util.js
@@ -178,6 +178,16 @@ class Util {
 
         return serverName.split('%')[2]
     }
+
+    /**
+     * カタカナをひらがなに変換
+     * */
+    static kanaToHira(str) {
+        return str.replace(/[\u30a1-\u30f6]/g, function(match) {
+            let chr = match.charCodeAt(0) - 0x60;
+            return String.fromCharCode(chr);
+        });
+    }
 }
 
 module.exports = Util