Merge branch 'fix/load_100_more_messages' into 'develop'

Fix/load 100 more messages

See merge request !215

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

@@ -186,7 +186,7 @@ CHAT_SOCKET.cleanUpCollaborationMessage = function () {
       .attr("disabled", "disabled");
       .attr("disabled", "disabled");
     $(collaborationMessage)
     $(collaborationMessage)
       .find(".collaboration_join_message")
       .find(".collaboration_join_message")
-      .text(getLocalizedString("flex-directionmessage_ended"));
+      .text(getLocalizedString("message_ended"));
   });
   });
 };
 };
 
 

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

@@ -12,30 +12,39 @@ window.onscroll = function () {
   beforeScroll = window.scrollY;
   beforeScroll = window.scrollY;
   const beforeHeight = $(".room_container").height();
   const beforeHeight = $(".room_container").height();
   messageCount = $(".chat_message").length;
   messageCount = $(".chat_message").length;
-  // TODO: peacekim :: check this condition
   if ($(this).scrollTop() === 0 && messageCount >= PagingSize.MESSAGE) {
   if ($(this).scrollTop() === 0 && messageCount >= PagingSize.MESSAGE) {
-    setTimeout(function () {
+    setTimeout(() => {
       if (!$("#chatLoader").is(":visible")) {
       if (!$("#chatLoader").is(":visible")) {
         // display loading indicator in chat message
         // display loading indicator in chat message
         let loader = $(
         let loader = $(
           '<div id="chatLoader" class="text-center"><div class="spinner-grow spinner-grow-sm" role="status" /></div>'
           '<div id="chatLoader" class="text-center"><div class="spinner-grow spinner-grow-sm" role="status" /></div>'
         );
         );
         $("#messages").append(loader);
         $("#messages").append(loader);
-        // get lastest message id and update message from server via native
-        const messageID = $($(".chat_message").last()).data("messageid");
-        NativeBridgeDelegate.updatePreMessage(messageID);
-        let messages = NativeBridgeDataSource.getMessagesByMessageID(messageID);
+      }
+      ChatRoom.loadNewMessage().then((messages) => {
         // prepend message
         // prepend message
         ChatRoom.prependMessage(messages);
         ChatRoom.prependMessage(messages);
         // hide loading indicator
         // hide loading indicator
-        loader.remove();
-        var afterHeight = $(".room_container").height();
+        if (typeof loader !== "undefined") {
+          loader.remove();
+        }
+        const afterHeight = $(".room_container").height();
         window.scroll(0, afterHeight - beforeHeight);
         window.scroll(0, afterHeight - beforeHeight);
-      }
+      });
     }, 0);
     }, 0);
   }
   }
 };
 };
 
 
+ChatRoom.loadNewMessage = async function () {
+  return new Promise(function (done) {
+    // get lastest message id and update message from server via native
+    const messageID = $($(".chat_message").last()).data("messageid");
+    NativeBridgeDelegate.updatePreMessage(messageID);
+    let messages = NativeBridgeDataSource.getMessagesByMessageID(messageID);
+    done(messages);
+  });
+};
+
 document.addEventListener("DOMContentLoaded", function () {
 document.addEventListener("DOMContentLoaded", function () {
   // 検索イベントバインディング
   // 検索イベントバインディング
   ChatRoom.bindSearchUI();
   ChatRoom.bindSearchUI();