Merge branch 'release_sp3' into bugFix/#486_全クループ画面から全社範囲と全社の下位グループのアコーディオン範囲が重なって動作する

5b26391a · Lee Daehyun · 998e751a · 5b684341 · 5b26391a · 5b26391a
Commit 5b26391a authored Apr 08, 2021 by Lee Daehyun
11 changed files
--- a/public_new/archive.html
+++ b/public_new/archive.html
@@ -147,10 +147,13 @@
  let IS_ONLINE = false;
  $("#chatMenuModal").load("./modal_chat_menu.html");
  $("#loadingArea").load("./loading.html");
+  if (typeof(android) != "undefined") {
    android.getLoginParameter();
    android.getGlobalParameter();
+  } else {
    webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
    webkit.messageHandlers.getGlobalParameter.postMessage({});
+  }
  function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
    CHAT_SERVER_URL = chatServerUrl;

--- a/public_new/chat.html
+++ b/public_new/chat.html
@@ -130,8 +130,7 @@
      android.getLoginParameter();
      android.getGlobalParameter();
      android.saveSelectedUserList("");
-    }
+    } else {
-    if (typeof(webkit) != "undefined") {
      webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
      webkit.messageHandlers.getGlobalParameter.postMessage({});
    }

--- a/public_new/chat_room.html
+++ b/public_new/chat_room.html
@@ -21,11 +21,11 @@
  <!-- ナビメニュー -->
  <nav>
    <div class="chat_room_src_form none">
-      <form class="d-flex flex-row h-100 align-items-center">
+      <div class="d-flex flex-row h-100 align-items-center">
        <input type="search" name="search" placeholder="ユーザー検索">
        <span class="src_icon"></span>
        <a href="#" class="cancel">キャンセル</a>
-      </form>
+      </div>
    </div>
    <div class="row nav_item_wrap h-100 align-items-center">
      <div class="col-4 pr-0">
@@ -178,10 +178,13 @@
    $("#pictureModal").load("./modal_chat_picture.html");
    $("#chatMenuModal").load("./modal_chat_menu.html");
    $("#loadingArea").load("./loading.html");
+    if (typeof(android) != "undefined") {
      android.getLoginParameter();
      android.getGlobalParameter();
+    } else {
      webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
-    webkit.messageHandlers.getGlobalParameter.postMessage();
+      webkit.messageHandlers.getGlobalParameter.postMessage({});
+    }
    function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
      CHAT_SERVER_URL = chatServerUrl;

--- 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>
@@ -206,8 +206,7 @@
    if (typeof(android) != "undefined") {
      android.getLoginParameter();
      android.getGlobalParameter();
-    }
+    } else {
-    if (typeof(webkit) != "undefined") {
      webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
      webkit.messageHandlers.getGlobalParameter.postMessage({});
    }

--- a/public_new/js/chat-ui.js
+++ b/public_new/js/chat-ui.js
@@ -125,8 +125,11 @@ $('#room-search').on('input', function(event) {
        socket.emit('roomSearch', encodeURIComponent($('#room-search').val()));
    } else {
        if (IS_ONLINE == 'true') {
+            if (typeof(android) != "undefined") {
                android.updateRoomList();
+            } else {
                webkit.messageHandlers.updateRoomList.postMessage({});
+            }
            CHAT_UI.refreshRoomList(chatRoomType.DM);
            CHAT_UI.dismissLoadingIndicator();
        }
@@ -417,8 +420,11 @@ $('a[data-toggle="pill"]').on('show.bs.tab', function(e) {
                CHAT.saveRoomInfo();
                if (IS_ONLINE == 'true') {
                    socket.emit('leaveRoom', function() {
+                        if (typeof(android) != "undefined") {
                            android.updateRoomList();
-                        webkit.messageHandlers.updateRoomList.postMessage({});
+                        } else {
+                            webkit.messageHandlers.updateRoomList.postMessage({"groupId":"0"});
+                        }
                    });
                }
                CHAT_UI.refreshRoomList(chatRoomType.DM);
@@ -684,20 +690,13 @@ CHAT_UI.showConfirmView = function(isInvite) {
                    //todo android create room api
+                    if (typeof(android) != "undefined") {
                        android.createChatRoom("1",userIdList.join(','),newRoomName);
+                    } else {
-                    if (CHAT_UTIL.isIOS()) {
+                        webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": newRoomName});
-                        // TODO
-                        var roomDic = {
-                            roomType: "1",
-                            userIdList: userIdList.join(','),
-                            roomName: newRoomName
-                        };
-                        webkit.messageHandlers.createChatRoom.postMessage({roomDic});
                    }
                    /*socket.emit('createNewRoom', userIdList, encodedRoomName, function(newRoomId) {
                        socket.emit('joinRoom', newRoomId, newRoomName, function() {
                            CHAT.saveRoomInfo(newRoomId, newRoomName);
@@ -914,6 +913,7 @@ CHAT_UI.refreshContactScreen = function() {
    let contactListTitle = getLocalizedString("contactListTitle");
    $('#title').text(contactListTitle);
    // グループの様式を読み込む
    var groupTemplate;
    $.get({ url: "./template/template_group_list.html", async: false }
@@ -941,17 +941,13 @@ CHAT_UI.refreshContactScreen = function() {
    });
    if (IS_ONLINE == 'true') {
-        if ( typeof(android) != "undefined") {
+        if (typeof(android) != "undefined") {
            android.updateGroupInfo('0');
            android.updateMyInfo();
            android.updateGroupUser();
            android.updateFavorite();
-        }
+        } else {
-        if ( typeof(webkit) != "undefined") {
+            webkit.messageHandlers.updateGroupInfo.postMessage("0");
-            webkit.messageHandlers.updateGroupInfo.postMessage({"groupId":"0"});
-            webkit.messageHandlers.updateMyInfo.postMessage({});
-            webkit.messageHandlers.updateGroupUser.postMessage({});
-            webkit.messageHandlers.updateFavorite.postMessage({});
        }
    }
@@ -1027,10 +1023,10 @@ CHAT_UI.refreshRoomList = function(roomType) {
    }
    if (IS_ONLINE == 'true') {
-        if (CHAT_UTIL.isIOS()) {
+        if (typeof(android) != "undefined") {
-            webkit.messageHandlers.updateRoomList.postMessage({});
-        } else if (CHAT_UTIL.isAndroid()) {
            android.updateRoomList();
+        } else {
+            webkit.messageHandlers.updateRoomList.postMessage({});
        }
    }
    var rooms = CHAT_DB.getRoomList(roomType, null);
@@ -1118,15 +1114,21 @@ CHAT_UI.refreshRoomList = function(roomType) {
 CHAT_UI.joinRoom = function(roomId,roomName) {
    //native側に入場対象のroomId,roomNameを保存。(ルーム詳細画面初期化の時に使用。)
+    if (typeof(android) != "undefined") {
        android.joinRoom(roomId,roomName);
+    } else {
        webkit.messageHandlers.roomInfosaveMessageHandlerId.postMessage({"roomId": roomId, "roomName": roomName});
+    }
 };
 CHAT_UI.loadMessages = function(roomId, roomName) {
    if (IS_ONLINE == 'true') {
        CHAT_SOCKET.connectSocket();
+        if (typeof(android) != "undefined") {
            android.updateMessages(roomId);
+        } else {
            webkit.messageHandlers.updateMessages.postMessage({roomId});
+        }
        socket.emit('exitRoom',roomId);
        socket.emit('joinRoom', roomId, roomName, function() {
        });
@@ -1271,6 +1273,7 @@ $('#tabAllGroup').on('click', function(e) {
 });
 $('#tabMyGroup').on('click', function(e) {
+    $('#contactSearch').attr('placeholder', getLocalizedString('userSearch'));
    CHAT_UI.refreshContactScreen();
 });
@@ -1316,8 +1319,11 @@ CHAT_UI.removeFavoriteUser = function(shopMemberId) {
    CHAT_UI.showLoadingIndicator();
    $('#userNameCard').modal('hide');
    $('#myNameCard').modal('hide');
+    if (typeof(android) != "undefined") {
        android.removeFavoriteUser(shopMemberId);
+    } else {
        webkit.messageHandlers.removeFavoriteUser.postMessage({shopMemberId});
+    }
    $('.shopmember_'+shopMemberId).removeClass('active');
    $('.shopmember_'+shopMemberId).addClass('disable');
    CHAT_UI.dismissLoadingIndicator();
@@ -1328,20 +1334,23 @@ 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();
 };
 CHAT_UI.removeFavoriteGroup = function(groupId) {
+    if (typeof(android) != "undefined") {
        android.removeFavoriteGroup(groupId);
+    } else {
        webkit.messageHandlers.removeFavoriteGroup.postMessage({groupId});
+    }
    $('.group_'+groupId).removeClass('active');
    $('.group_'+groupId).addClass('disable');
    CHAT_UI.dismissLoadingIndicator();
@@ -1373,15 +1382,15 @@ 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);
    //オンライン状態であればサーバから情報更新。
    if (IS_ONLINE == 'true') {
-        if (CHAT_UTIL.isIOS()) {
+        if (typeof(android) != "undefined") {
-            webkit.messageHandlers.updateGroupInfo.postMessage({groupId});
-        } else if (CHAT_UTIL.isAndroid()) {
            android.updateGroupInfo(groupId);
+        } else {
+            webkit.messageHandlers.updateGroupInfo.postMessage({groupId});
        }
    }
@@ -1475,8 +1484,11 @@ CHAT_UI.startChat = function(userShopMemberId,userName) {
    // 参加ユーザ名でルーム名を生成
    let newRoomName = CHAT.globalLoginParameter.loginId + ',' +userName;
+    if (typeof(android) != "undefined") {
        android.createChatRoom(chatRoomType.DM, userIdList.join(','),newRoomName);
+    } else {
        webkit.messageHandlers.createChatRoom.postMessage({"roomType": chatRoomType.DM, "userIdList": userIdList.join(','), "roomName": newRoomName});
+    }
    CHAT_UI.hideNamecard(nameCardAreaId.USER);
 };

--- a/public_new/js/chat.js
+++ b/public_new/js/chat.js
@@ -343,16 +343,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;
@@ -360,7 +363,6 @@ $(function() {
            , function(text) {
                template = text;
        });
        rooms.forEach(function(room) {
            room.profileImagePath = ASSET_PATH + 'images/user-profile.png'
            if (room.message) {
@@ -405,26 +407,34 @@ $(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 ;
+        }
    });
    // チャットルーム
    // メッセージ検索イベント
    $('.chat_room_src_form input[type="search"]').keyup(function(e){
+        var keyword = $('.chat_room_src_form input[type="search"]').val();
        if (e.key == "Enter" || e.KeyCode == 13) {
+            if (keyword != '' && keyword.length != 0) {
                $('.chat_room_src_form input[type="search"]').blur();
-            return ;
+                return;
+            }
+        } else if (keyword == '' || keyword.length < 2) {
+            $('.overlay_src_msg').empty();
+            return;
        }
        let workVal = "";
-        var keyword = $('.chat_room_src_form input[type="search"]').val();
        $('.overlay_src_msg').empty();
        var checkedUserList = [];
        $('.img_wrap.filter').each(function(user) {
            var selectedUser = $('.img_wrap.filter')[user];
            checkedUserList.push($(selectedUser).data('user-id'));
        })
-        if (keyword.length < 2) { return; }
        var messages = CHAT_DB.searchMessages(keyword, checkedUserList.join(','));
        var userMessageTemplate;
        $.get({ url: "./template/template_user_message.html", async: false }
@@ -473,6 +483,10 @@ $(function() {
            noResultMsg.append(getLocalizedString("noResult"))
            jQueryMessages.append(noResultMsg);
        }
+        if (e.key == "Enter" || e.KeyCode == 13) {
+            $('#contact .search_form input[type="search"]').blur();
+            return;
+        }
    });
    $('.filter_img').on('click', function() {
@@ -484,7 +498,7 @@ $(function() {
            var selectedUser = $('.img_wrap.filter')[user];
            checkedUserList.push($(selectedUser).data('user-id'));
        })
-        if (keyword.length < 2) { return; }
+        if (keyword.length == 1) { return; }
        var messages = CHAT_DB.searchMessages(keyword, checkedUserList.join(','));
        var userMessageTemplate;
        $.get({ url: "./template/template_user_message.html", async: false }

--- 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){
+    $('#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":"유저,그룹 검색"
 }