Merge branch 'develop' into debug/console_logs

public_new/js/sockets/chat-websocket-message.js

@@ -79,8 +79,10 @@ CHAT_SOCKET.handleMessage = function (
   if (typeof ChatRoom !== "undefined") {
   if (typeof ChatRoom !== "undefined") {
     // 画像、動画の描画を待ってからスクロール
     // 画像、動画の描画を待ってからスクロール
     setTimeout(function () {
     setTimeout(function () {
-      ChatRoom.scrollToBottom();
-    }, 300);
+      let jQueryMessages = $("#messages");
+      ChatRoom.waitForLoadingImage(jQueryMessages, ChatRoom.scrollToBottom);
+      ChatRoom.waitForLoadingVideo(jQueryMessages, ChatRoom.scrollToBottom);
+    }, 0);
   } else {
   } else {
     Common.dismissLoadingIndicator();
     Common.dismissLoadingIndicator();
   }
   }

public_new/js/views/chats/chat-room.js

@@ -10,10 +10,10 @@ window.onscroll = function () {
     return;
     return;
   }
   }
   beforeScroll = window.scrollY;
   beforeScroll = window.scrollY;
-  ChatRoom.prependMessageWhenScrollIfNeeded();
+  ChatRoom.appendMessageWhenScrollIfNeeded();
 };
 };
 
 
-ChatRoom.prependMessageWhenScrollIfNeeded = function () {
+ChatRoom.appendMessageWhenScrollIfNeeded = function () {
   const beforeHeight = $(".room_container").height();
   const beforeHeight = $(".room_container").height();
   messageCount = $(".chat_message").length;
   messageCount = $(".chat_message").length;
   if ($(this).scrollTop() === 0 && messageCount >= PagingSize.MESSAGE) {
   if ($(this).scrollTop() === 0 && messageCount >= PagingSize.MESSAGE) {
@@ -27,7 +27,7 @@ ChatRoom.prependMessageWhenScrollIfNeeded = function () {
       }
       }
       ChatRoom.loadNewMessage().then((messages) => {
       ChatRoom.loadNewMessage().then((messages) => {
         // prepend message
         // prepend message
-        ChatRoom.prependMessage(messages);
+        ChatRoom.appendMessage(messages);
         // hide loading indicator
         // hide loading indicator
         if (typeof loader !== "undefined") {
         if (typeof loader !== "undefined") {
           loader.remove();
           loader.remove();