Skip to content

C
chat_webview
Commit 23c7ffc5 by Kang Donghun
Options

Merge branch 'release_sp3' into features/release_sp3_collaboration_audio 

# Conflicts:
#	public_new/js/chat-ui.js
parents 2db7333a 6225efac
Showing with 91 additions and 38 deletions
public_new/archive.html
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<main id="archive"> <main id="archive">
<!-- 検索 --> <!-- 検索 -->
<div class="search_form"> <div class="search_form">
<input type="search" name="search" placeholder="検索"> <input type="search" name="search" placeholder="検索" maxlength="50">
<span class="src_icon"></span> <span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a> <a href="#" class="cancel none">キャンセル</a>
</div> </div>
......
public_new/chat.html
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<main id="chat"> <main id="chat">
<!-- ユーザー検索 --> <!-- ユーザー検索 -->
<div class="search_form"> <div class="search_form">
<input type="search" name="search" placeholder="ルーム検索"> <input type="search" name="search" placeholder="ルーム検索" maxlength="20">
<span class="src_icon"></span> <span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a> <a href="#" class="cancel none">キャンセル</a>
</div> </div>
...@@ -133,6 +133,7 @@ ...@@ -133,6 +133,7 @@
} else { } else {
webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({}); webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
webkit.messageHandlers.getGlobalParameter.postMessage({}); webkit.messageHandlers.getGlobalParameter.postMessage({});
webkit.messageHandlers.saveSelectedUserList.postMessage("");
} }
function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) { function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
CHAT_SERVER_URL = chatServerUrl; CHAT_SERVER_URL = chatServerUrl;
......
public_new/chat_add_user.html
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<form id="addUserForm" action="chat_add_user_confirm.html" method="post"> <form id="addUserForm" action="chat_add_user_confirm.html" method="post">
<!-- ユーザー検索 --> <!-- ユーザー検索 -->
<div class="search_form my-2"> <div class="search_form my-2">
<input type="search" name="search" placeholder="ユーザー検索"> <input type="search" name="search" placeholder="ユーザー検索" maxlength="30">
<span class="src_icon"></span> <span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a> <a href="#" class="cancel none">キャンセル</a>
<input type="input" name="hidden_for_prevent_submit" hidden> <input type="input" name="hidden_for_prevent_submit" hidden>
...@@ -66,12 +66,12 @@ ...@@ -66,12 +66,12 @@
</div> </div>
</div> </div>
<div class="tab_content" id="tab2_content"> <div class="tab_content" id="tab2_content">
<div class="breadcrumb" id="groupPathAreaForMakeRoom"></div> <div class="breadcrumb" id="groupPathAreaForAddUser"></div>
<div class="chat_list"> <div class="chat_list">
<!-- 全グループ --> <!-- 全グループ -->
<ul class="p-0 chat_make_room_list"> <ul class="p-0 chat_make_room_list">
<li class="d-flex align-items-center" id="rootGroupArea"> <li class="d-flex align-items-center" id="rootGroupArea">
<a href="#" class="w-100" id="rootGroupBtnForMakeRoom"> <a href="#" class="w-100" id="rootGroupBtnForAddUser">
<div class="chat_item d-flex flex-row align-items-center"> <div class="chat_item d-flex flex-row align-items-center">
<div class="chat_item_l"> <div class="chat_item_l">
<div class="thumbnail"> <div class="thumbnail">
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</a> </a>
</li> </li>
<li class="d-flex align-items-center" id="parentGroupArea"> <li class="d-flex align-items-center" id="parentGroupArea">
<a href="#" class="w-100" id="parentGroupBtnForMakeRoom"> <a href="#" class="w-100" id="parentGroupBtnForAddUser">
<div class="chat_item d-flex flex-row align-items-center"> <div class="chat_item d-flex flex-row align-items-center">
<div class="chat_item_l"> <div class="chat_item_l">
<div class="thumbnail"> <div class="thumbnail">
...@@ -106,8 +106,8 @@ ...@@ -106,8 +106,8 @@
</div> </div>
</a> </a>
</li> </li>
<div id="childGroupListAreaForMakeRoom"></div> <div id="childGroupListAreaForAddUser"></div>
<div id="userInGroupListForMakeRoom"></div> <div id="userInGroupListForAddUser"></div>
</ul> </ul>
</div> </div>
</div> </div>
......
public_new/chat_make_room.html
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<form id="makeRoomForm" action="chat_make_room_confirm.html" method="post"> <form id="makeRoomForm" action="chat_make_room_confirm.html" method="post">
<!-- ユーザー検索 --> <!-- ユーザー検索 -->
<div class="search_form my-2"> <div class="search_form my-2">
<input type="search" name="search" placeholder="ユーザー検索"> <input type="search" name="search" placeholder="ユーザー検索" maxlength="30">
<span class="src_icon"></span> <span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a> <a href="#" class="cancel none">キャンセル</a>
<input type="input" name="hidden_for_prevent_submit" hidden> <input type="input" name="hidden_for_prevent_submit" hidden>
......
public_new/chat_make_room_confirm.html
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<!-- ルーム名入力 --> <!-- ルーム名入力 -->
<div class="room_name"> <div class="room_name">
<label><h2>ルーム名</h2></label> <label><h2>ルーム名</h2></label>
<input type="text" class="input_name_room" name="room_name" id="newRoomName" placeholder="ルーム名を入力してください"> <input type="text" class="input_name_room" name="room_name" id="newRoomName" placeholder="ルーム名を入力してください" maxlength="20">
</div> </div>
<!-- 参加者一覧 --> <!-- 参加者一覧 -->
......
public_new/chat_room.html
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<!--<link rel="stylesheet" href="./css/notosansjp.css">--> <!--<link rel="stylesheet" href="./css/notosansjp.css">-->
<link href="./fontawesome/css/all.css" rel="stylesheet"> <link href="./fontawesome/css/all.css" rel="stylesheet">
<link rel="stylesheet" href="./css/bootstrap.min.css"> <link rel="stylesheet" href="./css/bootstrap.min.css">
<link rel="stylesheet" href="./css/jquery-ui.min.css">
<link rel="stylesheet" href="./css/common.css"> <link rel="stylesheet" href="./css/common.css">
<link rel="stylesheet" href="./css/chat.css"> <link rel="stylesheet" href="./css/chat.css">
<link rel="stylesheet" href="./css/loading.css"> <link rel="stylesheet" href="./css/loading.css">
...@@ -22,7 +23,7 @@ ...@@ -22,7 +23,7 @@
<nav> <nav>
<div class="chat_room_src_form none"> <div class="chat_room_src_form none">
<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="メッセージ検索" maxlength="600">
<span class="src_icon"></span> <span class="src_icon"></span>
<a href="#" class="cancel" id="messageSearchCancle">キャンセル</a> <a href="#" class="cancel" id="messageSearchCancle">キャンセル</a>
</div> </div>
...@@ -93,7 +94,7 @@ ...@@ -93,7 +94,7 @@
<input class="d-none" type="file" name="image" id="videoInputTag" accept="video/mp4"> <input class="d-none" type="file" name="image" id="videoInputTag" accept="video/mp4">
</form> </form>
</div> </div>
<input type="text" name="message" class="message_input_form" id="messageInput" placeholder="メッセージを入力してください"> <input type="text" name="message" class="message_input_form" id="messageInput" placeholder="メッセージを入力してください" maxlength="600">
<button type="button" name="button" class="message_input_send none" id="messageSend" onclick="CHAT_UI.sendMessage(this);">送信</button> <button type="button" name="button" class="message_input_send none" id="messageSend" onclick="CHAT_UI.sendMessage(this);">送信</button>
</div> </div>
</div> </div>
......
public_new/collaboration_documents.html
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<!-- ユーザー検索 --> <!-- ユーザー検索 -->
<div class="search_form"> <div class="search_form">
<form> <form>
<input type="search" name="search" placeholder="ユーザー検索"> <input type="search" name="search" placeholder="ユーザー検索" maxlength="30">
<span class="src_icon"></span> <span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a> <a href="#" class="cancel none">キャンセル</a>
</form> </form>
......
public_new/collaboration_picture.html
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<!-- ユーザー検索 --> <!-- ユーザー検索 -->
<div class="search_form"> <div class="search_form">
<form> <form>
<input type="search" name="search" placeholder="ユーザー検索"> <input type="search" name="search" placeholder="ユーザー検索" maxlength="30">
<span class="src_icon"></span> <span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a> <a href="#" class="cancel none">キャンセル</a>
</form> </form>
......
public_new/collaboration_video.html
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<!-- ユーザー検索 --> <!-- ユーザー検索 -->
<div class="search_form"> <div class="search_form">
<form> <form>
<input type="search" name="search" placeholder="ユーザー検索"> <input type="search" name="search" placeholder="ユーザー検索" maxlength="30">
<span class="src_icon"></span> <span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a> <a href="#" class="cancel none">キャンセル</a>
</form> </form>
......
public_new/collaboration_voice.html
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<!-- ユーザー検索 --> <!-- ユーザー検索 -->
<div class="search_form"> <div class="search_form">
<form> <form>
<input type="search" name="search" placeholder="ユーザー検索"> <input type="search" name="search" placeholder="ユーザー検索" maxlength="30">
<span class="src_icon"></span> <span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a> <a href="#" class="cancel none">キャンセル</a>
</form> </form>
......
public_new/collaboration_whiteboard.html
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<!-- ユーザー検索 --> <!-- ユーザー検索 -->
<div class="search_form"> <div class="search_form">
<form> <form>
<input type="search" name="search" placeholder="ユーザー検索"> <input type="search" name="search" placeholder="ユーザー検索" maxlength="30">
<span class="src_icon"></span> <span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a> <a href="#" class="cancel none">キャンセル</a>
</form> </form>
......
public_new/contact.html
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<main id="contact"> <main id="contact">
<!-- ユーザー検索 --> <!-- ユーザー検索 -->
<div class="search_form"> <div class="search_form">
<input type="search" name="search" id="contactSearch" placeholder="ユーザー検索"> <input type="search" name="search" id="contactSearch" placeholder="ユーザー検索" maxlength="30">
<span class="src_icon"></span> <span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a> <a href="#" class="cancel none">キャンセル</a>
</div> </div>
......
public_new/css/chat.css
...@@ -594,10 +594,10 @@ input[name="tab_item"] { ...@@ -594,10 +594,10 @@ input[name="tab_item"] {
/* 既読エリア */ /* 既読エリア */
.room_left .date { .room_left .date {
position: absolute; position: absolute;
width: 80px; width: 110px;
text-align: left; text-align: left;
top: 30px; top: 30px;
right: -90px; right: -120px;
font-size: 12px; font-size: 12px;
} }
...@@ -635,7 +635,7 @@ input[name="tab_item"] { ...@@ -635,7 +635,7 @@ input[name="tab_item"] {
background-color: #0070ca; background-color: #0070ca;
color: #fff; color: #fff;
margin: 0; margin: 0;
margin-left: 80px; margin-left: 110px;
font-size: 18px; font-size: 18px;
word-break: break-word; word-break: break-word;
} }
...@@ -653,7 +653,7 @@ input[name="tab_item"] { ...@@ -653,7 +653,7 @@ input[name="tab_item"] {
/* 日付 */ /* 日付 */
.room_right .date { .room_right .date {
position: absolute; position: absolute;
width: 80px; width: 110px;
text-align: right; text-align: right;
top: 0px; top: 0px;
left: -10px; left: -10px;
......
public_new/js/archive.js
...@@ -17,12 +17,9 @@ $(function() { ...@@ -17,12 +17,9 @@ $(function() {
return; return;
} }
$('.overlay_src_msg').empty(); $('.overlay_src_msg').empty();
if (CHAT_UTIL.isIOS()) {
CHAT_DB.callGetArchiveByName(keyword);
} else if (CHAT_UTIL.isAndroid()) {
ARCHIVE_UI.refreshSearchScreen(keyword);
}
ARCHIVE_UI.refreshSearchScreen(keyword);
if (e.KeyCode == 13 || e.key == "Enter") { if (e.KeyCode == 13 || e.key == "Enter") {
$('#archive .search_form input[type="search"]').blur(); $('#archive .search_form input[type="search"]').blur();
return; return;
......
public_new/js/chat-db.js
...@@ -103,7 +103,7 @@ CHAT_DB.getGroupInfo = function(groupId) { ...@@ -103,7 +103,7 @@ CHAT_DB.getGroupInfo = function(groupId) {
CHAT_DB.getGroupInfoForAddUser = function(groupId) { CHAT_DB.getGroupInfoForAddUser = function(groupId) {
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
//TODO getGroupInfoの処理でユーザ情報にルーム参加者が入ってない処理。 return JSON.parse(callNativeApp("getGroupInfoForAddUser", {"groupId": groupId}));
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
//String形式をJsonに変更してReturn //String形式をJsonに変更してReturn
return JSON.parse(android.getGroupInfoForAddUser(groupId)); return JSON.parse(android.getGroupInfoForAddUser(groupId));
......
public_new/js/chat.js
...@@ -263,14 +263,6 @@ CHAT.leaveRoom = function() { ...@@ -263,14 +263,6 @@ CHAT.leaveRoom = function() {
} }
$(function() { $(function() {
// ルーム人数選択確認イベント
$('.make_room_btn button').click(function(){
$('form').submit();
});
// ルーム人数選択イベント
$('.make_room_confirm_btn button').click(function(){
$('form').submit();
});
// ユーザー追加確認イベント // ユーザー追加確認イベント
$('.add_user_confirm_btn button').click(function(){ $('.add_user_confirm_btn button').click(function(){
$('form').submit(); $('form').submit();
...@@ -383,8 +375,9 @@ $(function() { ...@@ -383,8 +375,9 @@ $(function() {
room.message = getLocalizedString("noMessages") room.message = getLocalizedString("noMessages")
} }
var displayMsg; var displayMsg;
if (room.messageType == messageType.TEXT || room.messageType == messageType.TEXT) displayMsg = room.message; if (room.messageType == messageType.TEXT || room.messageType == messageType.SYSTEM) displayMsg = room.message;
if (room.messageType == messageType.IMAGE || room.messageType == messageType.SYSTEM) displayMsg = getLocalizedString("image"); if (room.messageType == messageType.IMAGE) displayMsg = getLocalizedString("image");
if (room.messageType == messageType.VIDEO) displayMsg = getLocalizedString("video");
var attendUserName = []; var attendUserName = [];
room.attendUsers.forEach(function(user) { room.attendUsers.forEach(function(user) {
user.profileUrl = CHAT.getProfileImgUrl(user.profileUrl); user.profileUrl = CHAT.getProfileImgUrl(user.profileUrl);
......
public_new/template/template_add_user_group_list.html 0 → 100644
<li class="d-flex align-items-center">
<a href="#" class="w-100" onclick="CHAT_UI.refreshAllGroupForAddUser({{id}});">
<div class="chat_item d-flex flex-row align-items-center">
<div class="chat_item_l">
<div class="thumbnail">
<img src="icon/icon_folder.png" alt="フォルダ" />
</div>
</div>
<div class="chat_item_m px-0">
<div class="d-flex flex-column">
<div class="chat_item_t">
<span class="chat_item_ttl">{{name}}</span>
</div>
</div>
</div>
</div>
</a>
</li>
\ No newline at end of file
public_new/template/template_add_user_group_path.html 0 → 100644
<a href="#" class="breadcrumb_item" onclick="CHAT_UI.refreshAllGroupForAddUser({{id}});"><span>{{name}}</span></a>
\ No newline at end of file
public_new/template/template_add_user_group_user_list.html 0 → 100644
<div class="category" onclick="CHAT_UI.toggleCategory(this);"><div class="category_name"><span>{{groupName}}</span></div></div>
<ul class="p-0 chat_make_room_list">
{{#groupUserList}}
<li class="d-flex align-items-center">
<div class="chat_item d-flex flex-row align-items-center w-100" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});" >
<div class="chat_item_l_chk">
<div class="checkbox">
<label>
<input type="checkbox" id="checkbox{{shopMemberId}}" name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}>
<span class="checkbox-parts"></span>
</label>
</div>
</div>
<div class="chat_item_l">
<div class="thumbnail">
<div class="img_wrap"><img src="{{profileUrl}}" onError="this.src='./img/noImage.png'"/></div>
</div>
</div>
<div class="chat_item_m">
<div class="d-flex flex-column">
<div class="chat_item_t">
<span class="chat_item_ttl">{{shopMemberName}}</span>
</div>
</div>
</div>
</div>
</li>
{{/groupUserList}}
</ul>
\ No newline at end of file
public_new/template/template_my_message.html
...@@ -4,7 +4,12 @@ ...@@ -4,7 +4,12 @@
<div class="date d-flex flex-column"><span></span><span>{{createdAtTime}}</span></div> <div class="date d-flex flex-column"><span></span><span>{{createdAtTime}}</span></div>
{{/isToday}} {{/isToday}}
{{^isToday}} {{^isToday}}
{{#isOtherYear}}
<div class="date d-flex flex-column"><span>{{createdAtYear}} {{createdAtDay}}</span><span>{{createdAtTime}}</span></div>
{{/isOtherYear}}
{{^isOtherYear}}
<div class="date d-flex flex-column"><span>{{createdAtDay}}</span><span>{{createdAtTime}}</span></div> <div class="date d-flex flex-column"><span>{{createdAtDay}}</span><span>{{createdAtTime}}</span></div>
{{/isOtherYear}}
{{/isToday}} {{/isToday}}
{{#unreadCount}} {{#unreadCount}}
<div class="unread d-flex align-items-end"><span>{{unreadCount}}</span></div> <div class="unread d-flex align-items-end"><span>{{unreadCount}}</span></div>
......
public_new/template/template_user_message.html
...@@ -12,7 +12,12 @@ ...@@ -12,7 +12,12 @@
<div class="date d-flex flex-column"><span></span><span>{{createdAtTime}}</span></div> <div class="date d-flex flex-column"><span></span><span>{{createdAtTime}}</span></div>
{{/isToday}} {{/isToday}}
{{^isToday}} {{^isToday}}
{{#isOtherYear}}
<div class="date d-flex flex-column"><span>{{createdAtYear}} {{createdAtDay}}</span><span>{{createdAtTime}}</span></div>
{{/isOtherYear}}
{{^isOtherYear}}
<div class="date d-flex flex-column"><span>{{createdAtDay}}</span><span>{{createdAtTime}}</span></div> <div class="date d-flex flex-column"><span>{{createdAtDay}}</span><span>{{createdAtTime}}</span></div>
{{/isOtherYear}}
{{/isToday}} {{/isToday}}
{{#unreadCount}} {{#unreadCount}}
<div class="unread d-flex align-items-end"><span>{{unreadCount}}</span></div> <div class="unread d-flex align-items-end"><span>{{unreadCount}}</span></div>
......
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