Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
chat_webview
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abookCommunication
chat_webview
Commits
9ec78f17
Commit
9ec78f17
authored
May 11, 2021
by
Kang Donghun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[チャットルーム]のチャット履歴から現在協業が進行中なのか終了されたのか確認できる
parent
a1097bef
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
public_new/js/chat-ui.js
+3
-2
public_new/js/share.js
+1
-0
public_new/template/template_open_collaboration_message.html
+2
-2
No files found.
public_new/js/chat-ui.js
View file @
9ec78f17
...
...
@@ -1261,7 +1261,7 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
if
(
message
.
messageType
==
messageType
.
SYSTEM
)
{
template
=
systemMessageTemplate
;
}
if
(
message
.
messageType
==
messageType
.
COMMUNICATIONSTART
)
{
if
(
message
.
messageType
==
messageType
.
COMMUNICATIONSTART
||
message
.
messageType
==
messageType
.
COMMUNICATIONEND
)
{
template
=
openCollaborationMessageTemplate
;
}
let
messageTime
=
CHAT_UTIL
.
formatDate
(
message
.
insertDate
);
...
...
@@ -1326,7 +1326,8 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
createdAtDay
:
messageTime
.
createdAtDay
,
createdAtTime
:
messageTime
.
createdAtTime
,
createdAtYear
:
message
.
insertDate
.
substring
(
0
,
4
)
+
getLocalizedString
(
'year'
)
+
' '
,
isOtherYear
:
isOtherYear
isOtherYear
:
isOtherYear
,
isEnded
:
message
.
messageType
==
messageType
.
COMMUNICATIONEND
?
true
:
false
});
html
=
message
.
message
.
includes
(
'attachedImages'
)
||
message
.
message
.
includes
(
'attachedVideos'
)
?
CHAT_UTIL
.
htmlDecode
(
html
)
:
html
;
workVal
=
html
+
workVal
;
...
...
public_new/js/share.js
View file @
9ec78f17
...
...
@@ -269,6 +269,7 @@ function Coview_exitCollaboration(isDocument = false) {
}
}
coview_api
.
LeaveRoom
();
if
(
coview_api
.
getRoomUsers
())
{
android
.
finishCollaboration
()
};
isLeaved
=
true
;
if
(
collaborationJoinFlg
!=
'2'
)
{
CHAT_UI
.
joinRoom
(
CHAT
.
globalLoginParameter
.
roomId
,
CHAT
.
globalLoginParameter
.
name
);
...
...
public_new/template/template_open_collaboration_message.html
View file @
9ec78f17
...
...
@@ -9,7 +9,7 @@
<span>
{{createdAtDay}}
</span><span>
{{createdAtTime}}
</span>
{{/isToday}}
</div>
<div
class=
"collabo_area"
>
<div
class=
"collabo_area
{{#isEnded}} disable {{/isEnded}}
"
>
<div
class=
"collabo_desc"
>
<div
class=
"collabo_room_name d-flex flex-row"
>
<span>
{{roomName}}
</span>
...
...
@@ -27,7 +27,7 @@
</div>
</div>
<div
class=
"collabo_btn"
>
<button
type=
"button"
name=
"button"
onclick=
"CHAT_UI.joinCollaboration({{collaborationType}})"
>
<button
type=
"button"
name=
"button"
onclick=
"CHAT_UI.joinCollaboration({{collaborationType}})"
{{#
isEnded
}}
disabled
{{/
isEnded
}}
>
<img
src=
"icon/icon_profile_phone.png"
alt=
"通話"
>
<span>
参加する
</span>
</button>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment