Fixed chat room loading indicator timing

public_new/js/common/common.js

@@ -78,6 +78,9 @@ document.addEventListener("readystatechange", () => {
     case "interactive":
     case "interactive":
       break;
       break;
     case "complete":
     case "complete":
+      if (typeof initialLoading != "undefined" && initialLoading) {
+        break;
+      }
       Common.dismissLoadingIndicator();
       Common.dismissLoadingIndicator();
       break;
       break;
   }
   }

public_new/js/common/native-bridge-delegate.js

@@ -388,9 +388,9 @@ ReverseDelegate.leaveRoom = function () {
 };
 };
 
 
 // for android call
 // for android call
-ReverseDelegate.displayExistRoom = function (roomId) {
+ReverseDelegate.displayExistRoom = function (roomID) {
   if (confirm("error_already_exist_same_user")) {
   if (confirm("error_already_exist_same_user")) {
-    NativeBridgeDelegate.joinRoom(roomId);
+    NativeBridgeDelegate.joinRoom(roomID);
   }
   }
   return;
   return;
 };
 };

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

@@ -2,6 +2,7 @@ var beforeHeight = window.innerHeight;
 var beforeWidth = window.innerWidth;
 var beforeWidth = window.innerWidth;
 var beforeScroll;
 var beforeScroll;
 var roomName = "";
 var roomName = "";
+var initialLoading = true;
 var ChatRoom = {};
 var ChatRoom = {};
 
 
 window.onscroll = function () {
 window.onscroll = function () {
@@ -13,23 +14,25 @@ window.onscroll = function () {
   messageCount = $(".chat_message").length;
   messageCount = $(".chat_message").length;
   // TODO: peacekim :: check this condition
   // TODO: peacekim :: check this condition
   if ($(this).scrollTop() === 0 && messageCount >= PagingSize.MESSAGE) {
   if ($(this).scrollTop() === 0 && messageCount >= PagingSize.MESSAGE) {
-    if (!$("#chatLoader").is(":visible")) {
-      // display loading indicator in chat message
-      let loader = $(
-        '<div id="chatLoader" class="text-center"><div class="spinner-grow spinner-grow-sm" role="status" /></div>'
-      );
-      $("#messages").append(loader);
-      // get lastest message id and update message from server via native
-      const messageID = $($(".chat_message").get(0)).data("messageid");
-      NativeBridgeDelegate.updatePreMessage(messageID);
-      let messages = NativeBridgeDataSource.getMessagesByMessageID(messageID);
-      // prepend message
-      ChatRoom.prependMessage(messages);
-      // hide loading indicator
-      loader.remove();
-      var afterHeight = $(".room_container").height();
-      window.scroll(0, afterHeight - beforeHeight);
-    }
+    setTimeout(function () {
+      if (!$("#chatLoader").is(":visible")) {
+        // display loading indicator in chat message
+        let loader = $(
+          '<div id="chatLoader" class="text-center"><div class="spinner-grow spinner-grow-sm" role="status" /></div>'
+        );
+        $("#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);
+        // prepend message
+        ChatRoom.prependMessage(messages);
+        // hide loading indicator
+        loader.remove();
+        var afterHeight = $(".room_container").height();
+        window.scroll(0, afterHeight - beforeHeight);
+      }
+    }, 0);
   }
   }
 };
 };
 
 
@@ -176,7 +179,11 @@ ChatRoom.scrollToBottom = function (animated = true) {
     {
     {
       scrollTop: scrollHeight,
       scrollTop: scrollHeight,
     },
     },
-    animated ? 100 : 0
+    animated ? 100 : 0,
+    function () {
+      initialLoading = false;
+      Common.dismissLoadingIndicator();
+    }
   );
   );
 };
 };