検索処理修正。

51874fc0 · Lee Munkyeong · f4dcc293 · 51874fc0 · 51874fc0 · 51874fc0
Commit 51874fc0 authored Apr 07, 2021 by Lee Munkyeong
8 changed files
--- a/public_new/contact.html
+++ b/public_new/contact.html
@@ -45,7 +45,7 @@
  <main id="contact">
    <!-- ユーザー検索 -->
    <div class="search_form">
-        <input type="search" name="search" placeholder="ユーザー検索">
+        <input type="search" name="search" id="contactSearch" placeholder="ユーザー検索">
        <span class="src_icon"></span>
        <a href="#" class="cancel none">キャンセル</a>
    </div>

--- a/public_new/js/chat-ui.js
+++ b/public_new/js/chat-ui.js
@@ -901,6 +901,7 @@ CHAT_UI.refreshContactScreen = function() {
    let contactListTitle = getLocalizedString("contactListTitle");
    $('#title').text(contactListTitle);
    // グループの様式を読み込む
    var groupTemplate;
    $.get({ url: "./template/template_group_list.html", async: false }
@@ -1244,6 +1245,7 @@ $('#tabAllGroup').on('click', function(e) {
 });
 $('#tabMyGroup').on('click', function(e) {
+    $('#contactSearch').attr('placeholder', getLocalizedString('userSearch'));
    CHAT_UI.refreshContactScreen();
 });
@@ -1300,13 +1302,13 @@ CHAT_UI.insertFavoriteUser = function(shopMemberId) {
    $('#myNameCard').modal('hide');
    var result = android.addFavoriteUser(shopMemberId);
    if (!result) {
-        $('.shopmember_'+groupId).addClass('disable');
+        $('.shopmember_'+shopMemberId).addClass('disable');
-        $('.shopmember_'+groupId).removeClass('active');
+        $('.shopmember_'+shopMemberId).removeClass('active');
        CHAT_UI.dismissLoadingIndicator();
        return;
    } else {
-        $('.shopmember_'+groupId).removeClass('disable');
+        $('.shopmember_'+shopMemberId).removeClass('disable');
-        $('.shopmember_'+groupId).addClass('active');
+        $('.shopmember_'+shopMemberId).addClass('active');
    }
    CHAT_UI.dismissLoadingIndicator();
 };
@@ -1344,7 +1346,7 @@ CHAT_UI.refreshAllGroupSearch = function(paramGroupId) {
    $('.search_form form').removeClass();
    $('.content').removeClass('none');
    $('.overlay_src_msg').empty();
+    $('#contactSearch').attr('placeholder', getLocalizedString('searchUserAndGroup'));
    $('#tabAllGroup').prop('checked', true);
    //オンライン状態であればサーバから情報更新。

--- a/public_new/js/chat.js
+++ b/public_new/js/chat.js
@@ -339,16 +339,19 @@ $(function() {
    // チャットメンバー検索
    $('#chat .search_form input[type="search"]').keyup(function(e){
+        var rooms;
-        if (e.key == "Enter" || e.KeyCode == 13) {
+        var keyword = $('#chat .search_form input[type="search"]').val();
+        if (e.KeyCode == 13 || e.key == "Enter") {
+            if (keyword.length != 0 && keyword != '') {
                $('#chat .search_form input[type="search"]').blur();
-            return ;
+                return;
            }
+        } else if (keyword == '' || keyword.length < 2) {
            $('.overlay_src_msg').empty();
-        var keyword = $('#chat .search_form input[type="search"]').val();
+            return;
-        if (keyword == '' || keyword.length < 2) { return; }
+        }
-        var rooms = CHAT_DB.getRoomList(chatRoomType.ALL, keyword);
+        $('.overlay_src_msg').empty();
+        rooms = CHAT_DB.getRoomList(chatRoomType.ALL, keyword);
        let roomListTitle = getLocalizedString("room_search_placeholder");
        $('#chatTitle').text(roomListTitle);
        var template;
@@ -356,7 +359,6 @@ $(function() {
            , function(text) {
                template = text;
        });
        rooms.forEach(function(room) {
            room.profileImagePath = ASSET_PATH + 'images/user-profile.png'
            if (room.message) {
@@ -401,6 +403,11 @@ $(function() {
        if (CHAT_UI.isLandscapeMode()) {
            $(".chat_list").removeClass("col-12").addClass("col-6");
        }
+        if (e.KeyCode == 13 || e.key == "Enter") {
+            $('#chat .search_form input[type="search"]').blur();
+            return ;
+        }
    });

--- a/public_new/js/chatMakeRoom.js
+++ b/public_new/js/chatMakeRoom.js
@@ -2,21 +2,22 @@ $(function() {
  // メンバー検索
  $('#chatMakeRoom .search_form input[type="search"]').keyup(function(e) {
-    if (e.key == "Enter" || e.KeyCode == 13) {
+    var keyword = $('#chatMakeRoom .search_form input[type="search"]').val();
+    if (e.KeyCode == 13 || e.key == "Enter") {
+        if (keyword != '' && keyword.length != 0) {
             $('#chatMakeRoom .search_form input[type="search"]').blur();
            return false;
        }
+    } else if (keyword == '' || keyword.length < 2) {
+        $('.overlay_src_msg').empty();
+        return false;
+    }
    var isAllGroup = $('#tabAllGroupOnMakeRoom').is(':checked');
    $('.overlay_src_msg').empty();
    //全グループ検索画面
    if (isAllGroup) {
-        var keyword = $('#chatMakeRoom .search_form input[type="search"]').val();
-        if (keyword == '') {
-            return;
-        }
        //グループデータ検索
        var groupList = CHAT_DB.getGroupByName(keyword);
        var groupTemplate;
@@ -63,10 +64,6 @@ $(function() {
        }
 　　//連絡先画面
    } else {
-        var keyword = $('#chatMakeRoom .search_form input[type="search"]').val();
-        if (keyword == '') {
-            return;
-        }
        var userList = CHAT_DB.getMyGroupShopMemberByName(keyword);
        var userTemplate;
        $.get({ url: "./template/template_make_room_user_list.html", async: false }
@@ -92,6 +89,11 @@ $(function() {
            noResultMsg.append(getLocalizedString("noResult"))
            $('.overlay_src_msg').append(noResultMsg);
        }
+    }
+    if (e.key == "Enter" || e.KeyCode == 13) {
+        $('#chatMakeRoom .search_form input[type="search"]').blur();
+        return;
    }
  });
 });
--- a/public_new/js/contact.js
+++ b/public_new/js/contact.js
 $(function () {
    // メンバー検索
    $('#contact .search_form input[type="search"]').keyup(function(e){
+        var groupList;
+        var keyword = $('#contact .search_form input[type="search"]').val();
        if (e.key == "Enter" || e.KeyCode == 13) {
+            if (keyword != '' && keyword.length != 0) {
                $('#contact .search_form input[type="search"]').blur();
-        return ;
+                return;
            }
+        } else if (keyword == '' || keyword.length < 2) {
-    var isAllGroup = $('#tabAllGroup').is(':checked');
            $('.overlay_src_msg').empty();
-    var keyword = $('#contact .search_form input[type="search"]').val();
-    if (keyword == '' || keyword.length < 2) {
            return;
        }
+        $('.overlay_src_msg').empty();
+        var isAllGroup = $('#tabAllGroup').is(':checked');
        //全グループ検索画面
        if (isAllGroup) {
            //グループデータ検索
-        var groupList = CHAT_DB.getGroupByName(keyword);
+            groupList = CHAT_DB.getGroupByName(keyword);
            var groupTemplate;
            $.get({ url: "./template/template_group_list.html", async: false }
                , function(text) {
@@ -29,7 +30,6 @@ $(function () {
                    id: group.groupId,
                    isFavorite: group.isFavorite
                });
                let obj = jQuery.parseHTML(html);
                $('.overlay_src_msg').append(obj);
            })
@@ -48,19 +48,14 @@ $(function () {
                userList: userList
            });
            let obj = jQuery.parseHTML(html);
            $('.overlay_src_msg').append(obj);
            if (userList.length == 0 && groupList.length == 0) {
                const noResultMsg = $('<div/>',{width:'auto', style:'text-align: center'});
                noResultMsg.append(getLocalizedString("noResult"))
                $('.overlay_src_msg').append(noResultMsg);
            }
-　　//連絡先画面
+        //連絡先画面
        } else {
-        var keyword = $('#contact .search_form input[type="search"]').val();
-        if (keyword == '') {
-            return;
-        }
            var userList = CHAT_DB.getMyGroupShopMemberByName(keyword);
            var userTemplate;
            $.get({ url: "./template/template_user_list.html", async: false }
@@ -81,5 +76,9 @@ $(function () {
                $('.overlay_src_msg').append(noResultMsg);
            }
        }
+        if (e.key == "Enter" || e.KeyCode == 13) {
+            $('#contact .search_form input[type="search"]').blur();
+            return;
+        }
    });
 });
--- a/public_new/js/language_en.js
+++ b/public_new/js/language_en.js
@@ -77,5 +77,6 @@ $.lang.en = {
    "archiveRoomName":"ChatRoom Name",
    "archiveSaveUser":"Save User",
    "archiveAttendUser":"Attend User",
-    "noResult":"there is no search result."
+    "noResult":"there is no search result.",
+    "searchUserAndGroup":"search user and group."
 }
--- a/public_new/js/language_ja.js
+++ b/public_new/js/language_ja.js
@@ -77,5 +77,6 @@ $.lang.ja = {
    "archiveRoomName":"チャットルーム名",
    "archiveSaveUser":"保存ユーザー",
    "archiveAttendUser":"参加ユーザー",
-    "noResult":"検索結果がありませんでした。"
+    "noResult":"検索結果がありませんでした。",
+    "searchUserAndGroup":"ユーザーとグループ検索"
 }
--- a/public_new/js/language_ko.js
+++ b/public_new/js/language_ko.js
@@ -77,5 +77,6 @@ $.lang.ko = {
    "archiveRoomName":"대화방 이름",
    "archiveSaveUser":"저장 사용자",
    "archiveAttendUser":"참여자",
-    "noResult":"검색결과가 존재하지않습니다"
+    "noResult":"검색결과가 존재하지않습니다",
+    "searchUserAndGroup":"유저,그룹 검색"
 }