Skip to content

C
chat_webview
Commit 89faf50a by Kang Donghun
Options

Merge branch 'bugfix/#499-招待画面リストクリア修正' into 'release_sp3' 

Bugfix/#499 招待画面リストクリア修正

See merge request !38
parents aeed436b a4a781bf
Showing with 24 additions and 11 deletions
public_new/chat_add_user.html
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
<div class="col-4 pr-0"> <div class="col-4 pr-0">
<div class="nav-item"> <div class="nav-item">
<div class="nav_prev"> <div class="nav_prev">
<a href="chat_room.html"><span>ルーム</span></a> <a href="chat_room.html"><span style="font-size: 13px;">ルーム</span></a>
</div> </div>
</div> </div>
</div> </div>
<div class="col-4 p-0"> <div class="col-4 p-0">
<div class="nav-item p-0"> <div class="nav-item p-0">
<h1 class="nav-ttl" id="title" style="font-size: 13px;">ユーザ招待</h1> <h1 class="nav-ttl" id="addUserTitle">ユーザー招待</h1>
</div> </div>
</div> </div>
<div class="col-4 pl-0"> <div class="col-4 pl-0">
......
public_new/chat_make_room.html
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
<div class="col-4 pr-0"> <div class="col-4 pr-0">
<div class="nav-item"> <div class="nav-item">
<div class="nav_prev"> <div class="nav_prev">
<a href="chat.html"><span>チャット</span></a> <a href="chat.html"><span style="font-size: 13px;">チャット</span></a>
</div> </div>
</div> </div>
</div> </div>
<div class="col-4 p-0"> <div class="col-4 p-0">
<div class="nav-item p-0"> <div class="nav-item p-0">
<h1 class="nav-ttl" id="title" style="font-size: 13px;">ルーム開設</h1> <h1 class="nav-ttl" id="makeRoomTitle">ルーム開設</h1>
</div> </div>
</div> </div>
<div class="col-4 pl-0"> <div class="col-4 pl-0">
......
public_new/chat_room.html
...@@ -178,9 +178,11 @@ ...@@ -178,9 +178,11 @@
$("#pictureModal").load("./modal_chat_picture.html"); $("#pictureModal").load("./modal_chat_picture.html");
$("#chatMenuModal").load("./modal_chat_menu.html"); $("#chatMenuModal").load("./modal_chat_menu.html");
$("#loadingArea").load("./loading.html"); $("#loadingArea").load("./loading.html");
if (typeof(android) != "undefined") { if (typeof(android) != "undefined") {
android.getLoginParameter(); android.getLoginParameter();
android.getGlobalParameter(); android.getGlobalParameter();
android.saveSelectedUserList("");
} else { } else {
webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({}); webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
webkit.messageHandlers.getGlobalParameter.postMessage({}); webkit.messageHandlers.getGlobalParameter.postMessage({});
......
public_new/js/chat-add-user.js
$(function() { $(function() {
// メンバー検索 // メンバー検索
$('#chat_add_user .search_form input[type="search"]').click(function(e){
//画面タイトル設定
let contactListTitle = getLocalizedString("userSearch");
$('#addUserTitle').text(contactListTitle);
})
$('#chat_add_user .search_form input[type="search"]').keyup(function(e){ $('#chat_add_user .search_form input[type="search"]').keyup(function(e){
if (e.key == "Enter" || e.KeyCode == 13) { if (e.key == "Enter" || e.KeyCode == 13) {
......
public_new/js/chat.js
...@@ -332,13 +332,13 @@ $(function() { ...@@ -332,13 +332,13 @@ $(function() {
}); });
$('#chat_add_user .search_form .cancel').click(function() { $('#chat_add_user .search_form .cancel').click(function() {
CHAT.globalSelectedUserList.forEach(function(userId) { let roomListTitle = getLocalizedString("inviteUsersSubtitle");
if ($('.checkbox' + userId).prop('checked')) { $('#addUserTitle').text(roomListTitle);
$('.checkbox' + userId).prop("checked", false).trigger("change");
} else {
$('.checkbox' + userId).prop("checked", true).trigger("change");
}
}); });
$('#chatMakeRoom .search_form .cancel').click(function() {
let roomListTitle = getLocalizedString("createRoomTitle");
$('#makeRoomTitle').text(roomListTitle);
}); });
// チャットメンバー検索 // チャットメンバー検索
......
public_new/js/chatMakeRoom.js
$(function() { $(function() {
// メンバー検索 // メンバー検索
$('#chatMakeRoom .search_form input[type="search"]').click(function(e) {
let contactListTitle = getLocalizedString("userSearch");
$('#makeRoomTitle').text(contactListTitle);
});
$('#chatMakeRoom .search_form input[type="search"]').keyup(function(e) { $('#chatMakeRoom .search_form input[type="search"]').keyup(function(e) {
　//画面タイトル設定
var keyword = $('#chatMakeRoom .search_form input[type="search"]').val(); var keyword = $('#chatMakeRoom .search_form input[type="search"]').val();
if (e.KeyCode == 13 || e.key == "Enter") { if (e.KeyCode == 13 || e.key == "Enter") {
if (keyword != '' && keyword.length != 0) { if (keyword != '' && keyword.length != 0) {
......
public_new/js/language_ja.js
...@@ -10,7 +10,7 @@ $.lang.ja = { ...@@ -10,7 +10,7 @@ $.lang.ja = {
"inviteUsersTitle":"メンバー追加", "inviteUsersTitle":"メンバー追加",
"createRoomTitle":"ルーム開設", "createRoomTitle":"ルーム開設",
"createRoomSubtitle":"ルーム名", "createRoomSubtitle":"ルーム名",
"inviteUsersSubtitle":"ユーザ招待", "inviteUsersSubtitle":"ユーザー招待",
"roomListEmptyString":"入場できるルームがありません。", "roomListEmptyString":"入場できるルームがありません。",
"left":"%@ 様が退場しました。", "left":"%@ 様が退場しました。",
"join":"%@ 様が入場しました。", "join":"%@ 様が入場しました。",
......
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