Merge branch 'develop' into debug/console_logs

public_new/chat_room.html

@@ -25,7 +25,7 @@
       <div 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" id="searchMessage" placeholder="メッセージ検索" maxlength="600">
         <input type="search" name="search" id="searchMessage" placeholder="メッセージ検索" maxlength="600">
         <span class="src_icon"></span>
         <span class="src_icon"></span>
-        <a href="#" class="cancel" id="messageSearchCancle">キャンセル</a>
+        <a href="#" class="cancel" id="messageSearchCancel">キャンセル</a>
       </div>
       </div>
     </div>
     </div>
     <div class="row nav_item_wrap h-100 align-items-center">
     <div class="row nav_item_wrap h-100 align-items-center">

public_new/js/views/chats/chat-room-search.js

@@ -21,7 +21,7 @@ ChatRoom.bindSearchUI = function () {
     chatSearchInput.focus();
     chatSearchInput.focus();
     searchMessage.addClass("onfocus");
     searchMessage.addClass("onfocus");
     $(".chat_list").removeClass("none");
     $(".chat_list").removeClass("none");
-    
+
     //メッセージ情報をCMS側から最新に更新
     //メッセージ情報をCMS側から最新に更新
     NativeBridgeDelegate.updatePreMessage("");
     NativeBridgeDelegate.updatePreMessage("");
   });
   });
@@ -105,14 +105,18 @@ ChatRoom.bindSearchUI = function () {
     }
     }
   });
   });
 
 
-  ChatRoom.bindUserFilteredMessage();
-
   // フィルタ選択イベント
   // フィルタ選択イベント
   $(document).on("click", "#filter .img_wrap", function (event) {
   $(document).on("click", "#filter .img_wrap", function (event) {
     console.log("peacekim:: ChatRoom.bindSearchUI .filter .img_wrap clicked");
     console.log("peacekim:: ChatRoom.bindSearchUI .filter .img_wrap clicked");
     // チェックアイコン追加
     // チェックアイコン追加
     $(this).toggleClass("filter");
     $(this).toggleClass("filter");
   });
   });
+
+  ChatRoom.bindUserFilteredMessage();
+
+  $("#messageSearchCancel").on("click", function (event) {
+    $(".img_wrap.filter").removeClass("filter");
+  });
 };
 };
 
 
 ChatRoom.bindUserFilteredMessage = function () {
 ChatRoom.bindUserFilteredMessage = function () {
@@ -161,4 +165,4 @@ ChatRoom.getCheckedUserList = function () {
     checkedUserList.push($(selectedUser).data("user-id"));
     checkedUserList.push($(selectedUser).data("user-id"));
   });
   });
   return checkedUserList;
   return checkedUserList;
-};
+};
\ No newline at end of file