Commit c1fa8f55 by Lee Munkyeong

ユーザ招待で同じルームがあればポップアップを表示

parent 5e808b38
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,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="メッセージ検索"> <input type="search" name="search" id="searchMessage" placeholder="メッセージ検索">
<span class="src_icon"></span> <span class="src_icon"></span>
<a href="#" class="cancel">キャンセル</a> <a href="#" class="cancel" id="messageSearchCancle">キャンセル</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">
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<!-- フィルター --> <!-- フィルター -->
<div id="filter" class="user_list filter d-flex flex-row none"></div> <div id="filter" class="user_list filter d-flex flex-row none"></div>
<div class="chat_list" id="searchList"> <div class="chat_list none" id="searchList">
<ul class="overlay_src_msg"> <ul class="overlay_src_msg">
</ul> </ul>
</div> </div>
......
...@@ -2366,4 +2366,11 @@ CHAT_UI.refreshForOffline = function() { ...@@ -2366,4 +2366,11 @@ CHAT_UI.refreshForOffline = function() {
$('.attach_file').hide(); $('.attach_file').hide();
$('.fa-download').hide(); $('.fa-download').hide();
$('.chat_room_footer').hide(); $('.chat_room_footer').hide();
}
CHAT_UI.displayExistRoom = function(roomId) {
if (confirm('error_already_exist_same_user')) {
android.joinRoom(roomId, '');
}
return;
} }
\ No newline at end of file
...@@ -284,6 +284,7 @@ $(function() { ...@@ -284,6 +284,7 @@ $(function() {
$('.chat_room_src_form input[type="search"]').focus(); $('.chat_room_src_form input[type="search"]').focus();
$('#searchMessage').addClass('onfocus'); $('#searchMessage').addClass('onfocus');
$('.chat_list').removeClass('none');
}); });
$('.chat_room_src_form .cancel').click(function(){ $('.chat_room_src_form .cancel').click(function(){
$('.nav_item_wrap').removeClass('none'); $('.nav_item_wrap').removeClass('none');
...@@ -297,6 +298,7 @@ $(function() { ...@@ -297,6 +298,7 @@ $(function() {
$('.chat_room_src_form input[type="search"]').blur(); $('.chat_room_src_form input[type="search"]').blur();
$('#searchMessage').removeClass('onfocus'); $('#searchMessage').removeClass('onfocus');
$('.chat_list').addClass('none');
}); });
$('.chat_room_src_form input[type="search"]').click(function() { $('.chat_room_src_form input[type="search"]').click(function() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment