Commit caecb139 by Kim Peace

Fixed to display native loading indicator in android

parent 71bcbbc2
...@@ -47,6 +47,8 @@ CHAT_SOCKET.bindOnNewMessage = function () { ...@@ -47,6 +47,8 @@ CHAT_SOCKET.bindOnNewMessage = function () {
setTimeout(function () { setTimeout(function () {
ChatRoom.scrollToBottom(); ChatRoom.scrollToBottom();
}, 300); }, 300);
} else {
Common.dismissLoadingIndicator();
} }
}); });
}; };
......
...@@ -10,7 +10,6 @@ $("#tabGroup").on("click", function (e) { ...@@ -10,7 +10,6 @@ $("#tabGroup").on("click", function (e) {
document.addEventListener("DOMContentLoaded", function () { document.addEventListener("DOMContentLoaded", function () {
ChatList.bindChatSearch(); ChatList.bindChatSearch();
Common.dismissLoadingIndicator();
}); });
ChatList.bindChatSearch = function () { ChatList.bindChatSearch = function () {
......
...@@ -98,16 +98,14 @@ ChatRoom.loadMessages = function (joinRoomID, joinRoomName) { ...@@ -98,16 +98,14 @@ ChatRoom.loadMessages = function (joinRoomID, joinRoomName) {
let messages = NativeBridgeDataSource.getMessagesByRoomID(roomID); let messages = NativeBridgeDataSource.getMessagesByRoomID(roomID);
ChatRoom.prependMessage(messages); ChatRoom.prependMessage(messages);
// iOS用スクロールoffset調整
if (deviceInfo.isiOS()) { window.addEventListener(
window.addEventListener( "load",
"load", function (event) {
function (event) { ChatRoom.scrollToBottom(false);
ChatRoom.scrollToBottom(false); },
}, false
false );
);
}
}; };
ChatRoom.configureRoomMenu = function () { ChatRoom.configureRoomMenu = function () {
......
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