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
7ed29d07
Commit
7ed29d07
authored
Apr 12, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugFix/#477_未読数追加' into 'release_sp3'
未読数実装 See merge request
!37
parents
30b36fe2
d2d4b8d2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
3 deletions
+11
-3
public_new/chat_add_user.html
+1
-1
public_new/js/chat-ui.js
+1
-0
public_new/js/constant.js
+1
-0
public_new/template/template_my_message.html
+4
-1
public_new/template/template_user_message.html
+4
-1
No files found.
public_new/chat_add_user.html
View file @
7ed29d07
...
...
@@ -113,7 +113,7 @@
</div>
</div>
<div
class=
"chat_make_room"
>
<ul
class=
"overlay_src_msg"
>
<ul
class=
"overlay_src_msg"
style=
"padding-inline-start: 20px;"
>
</ul>
</div>
<!-- ルーム解説ボタン -->
...
...
public_new/js/chat-ui.js
View file @
7ed29d07
...
...
@@ -1231,6 +1231,7 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
profileImage
:
message
.
profileUrl
,
createdAtDay
:
messageTime
.
createdAtDay
,
createdAtTime
:
messageTime
.
createdAtTime
,
unreadCount
:
message
.
unreadCount
,
isToday
:
isToday
});
html
=
message
.
message
.
includes
(
'attachedImages'
)
||
message
.
message
.
includes
(
'attachedVideos'
)
?
CHAT_UTIL
.
htmlDecode
(
html
)
:
html
;
...
...
public_new/js/constant.js
View file @
7ed29d07
...
...
@@ -37,3 +37,4 @@ const nameCardAreaId = {
}
const
messageSeperator
=
"<::split>"
;
const
dataMessageScheme
=
"::NOT_MESSAGE"
;
public_new/template/template_my_message.html
View file @
7ed29d07
...
...
@@ -6,5 +6,7 @@
{{^isToday}}
<div
class=
"date d-flex flex-column"
><span>
{{createdAtDay}}
</span><span>
{{createdAtTime}}
</span></div>
{{/isToday}}
<div
class=
"read d-flex align-items-end"
><span></span></div>
{{#unreadCount}}
<div
class=
"unread d-flex align-items-end"
><span>
{{unreadCount}}
</span></div>
{{/unreadCount}}
</div>
\ No newline at end of file
public_new/template/template_user_message.html
View file @
7ed29d07
...
...
@@ -14,5 +14,7 @@
{{^isToday}}
<div
class=
"date d-flex flex-column"
><span>
{{createdAtDay}}
</span><span>
{{createdAtTime}}
</span></div>
{{/isToday}}
<div
class=
"read d-flex align-items-end"
><span></span></div>
{{#unreadCount}}
<div
class=
"unread d-flex align-items-end"
><span>
{{unreadCount}}
</span></div>
{{/unreadCount}}
</div>
\ No newline at end of file
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