Commit 7ed29d07 by Lee Munkyeong

Merge branch 'bugFix/#477_未読数追加' into 'release_sp3'

未読数実装

See merge request !37
parents 30b36fe2 d2d4b8d2
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
</div> </div>
</div> </div>
<div class="chat_make_room"> <div class="chat_make_room">
<ul class="overlay_src_msg"> <ul class="overlay_src_msg" style="padding-inline-start: 20px;">
</ul> </ul>
</div> </div>
<!-- ルーム解説ボタン --> <!-- ルーム解説ボタン -->
......
...@@ -1231,6 +1231,7 @@ CHAT_UI.loadMessages = function(roomId, roomName) { ...@@ -1231,6 +1231,7 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
profileImage: message.profileUrl, profileImage: message.profileUrl,
createdAtDay: messageTime.createdAtDay, createdAtDay: messageTime.createdAtDay,
createdAtTime: messageTime.createdAtTime, createdAtTime: messageTime.createdAtTime,
unreadCount: message.unreadCount,
isToday: isToday isToday: isToday
}); });
html = message.message.includes('attachedImages') || message.message.includes('attachedVideos') ? CHAT_UTIL.htmlDecode(html) : html; html = message.message.includes('attachedImages') || message.message.includes('attachedVideos') ? CHAT_UTIL.htmlDecode(html) : html;
......
...@@ -37,3 +37,4 @@ const nameCardAreaId = { ...@@ -37,3 +37,4 @@ const nameCardAreaId = {
} }
const messageSeperator = "<::split>"; const messageSeperator = "<::split>";
const dataMessageScheme = "::NOT_MESSAGE";
...@@ -6,5 +6,7 @@ ...@@ -6,5 +6,7 @@
{{^isToday}} {{^isToday}}
<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>
{{/isToday}} {{/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> </div>
\ No newline at end of file
...@@ -14,5 +14,7 @@ ...@@ -14,5 +14,7 @@
{{^isToday}} {{^isToday}}
<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>
{{/isToday}} {{/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> </div>
\ No newline at end of file
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