Commit e656af13 by Kim Peace

Merge branch 'bug/#43953_user_list_in_chat_room' into 'develop'

Bug/#43953 user list in chat room

See merge request !233
parents f190b633 40666e69
...@@ -49,6 +49,12 @@ ChatRoom.loadNewMessage = async function () { ...@@ -49,6 +49,12 @@ ChatRoom.loadNewMessage = async function () {
}); });
}; };
document.addEventListener("readystatechange", () => {
if (document.readyState == "complete") {
$("#chat_room .user_list").removeClass("hide");
}
});
document.addEventListener("DOMContentLoaded", function () { document.addEventListener("DOMContentLoaded", function () {
// 検索イベントバインディング // 検索イベントバインディング
ChatRoom.bindSearchUI(); ChatRoom.bindSearchUI();
...@@ -135,7 +141,9 @@ ChatRoom.bindUserListDisplayToggle = function () { ...@@ -135,7 +141,9 @@ ChatRoom.bindUserListDisplayToggle = function () {
let winScrollTop = 0; let winScrollTop = 0;
$(window).on("scroll", function () { $(window).on("scroll", function () {
winScrollTop = $(this).scrollTop(); winScrollTop = $(this).scrollTop();
if (winScrollTop >= startPos) { if (startPos == 0) {
$("#chat_room .user_list").removeClass("hide");
} else if (winScrollTop >= startPos) {
if (winScrollTop >= 200) { if (winScrollTop >= 200) {
$("#chat_room .user_list").addClass("hide"); $("#chat_room .user_list").addClass("hide");
} }
...@@ -147,7 +155,7 @@ ChatRoom.bindUserListDisplayToggle = function () { ...@@ -147,7 +155,7 @@ ChatRoom.bindUserListDisplayToggle = function () {
}; };
ChatRoom.bindUserInviteButton = function () { ChatRoom.bindUserInviteButton = function () {
$("#add_user_button").on("click", function(e) { $("#add_user_button").on("click", function (e) {
NativeBridgeDelegate.showLoadingIndicator(); NativeBridgeDelegate.showLoadingIndicator();
}); });
}; };
......
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