Commit e567327d by Kim Peace

Fixed to display loading indicator in collaboration

parent caecb139
...@@ -406,6 +406,7 @@ function getReplacedLoginId(loginId) { ...@@ -406,6 +406,7 @@ function getReplacedLoginId(loginId) {
CoviewBridge.exitCollaboration = function () { CoviewBridge.exitCollaboration = function () {
CollaborationFeature.disableScrollLock(); CollaborationFeature.disableScrollLock();
Common.showLoadingIndicator();
if (g_isMainMan) { if (g_isMainMan) {
CHAT_SOCKET.emitCollaborationFinishMessage(); CHAT_SOCKET.emitCollaborationFinishMessage();
...@@ -422,6 +423,7 @@ CoviewBridge.exitCollaboration = function () { ...@@ -422,6 +423,7 @@ CoviewBridge.exitCollaboration = function () {
}; };
CoviewBridge.finishCollaboration = function () { CoviewBridge.finishCollaboration = function () {
Common.showLoadingIndicator();
coview_api.LeaveRoom(); coview_api.LeaveRoom();
if (coview_api.getRoomUsers()) { if (coview_api.getRoomUsers()) {
NativeBridgeDelegate.finishCollaboration(); NativeBridgeDelegate.finishCollaboration();
...@@ -433,6 +435,7 @@ CoviewBridge.finishCollaboration = function () { ...@@ -433,6 +435,7 @@ CoviewBridge.finishCollaboration = function () {
} else { } else {
NativeBridgeDelegate.joinRoom(roomInfo.roomID, roomInfo.roomName); NativeBridgeDelegate.joinRoom(roomInfo.roomID, roomInfo.roomName);
} }
Common.dismissLoadingIndicator();
}; };
// Display User List // Display User List
...@@ -444,7 +447,6 @@ CollaborationUI.refreshJoinedCollaboration = function (loginIDList) { ...@@ -444,7 +447,6 @@ CollaborationUI.refreshJoinedCollaboration = function (loginIDList) {
); );
} }
Common.showLoadingIndicator();
$("#collaboration_overlay_user_list").html(""); $("#collaboration_overlay_user_list").html("");
const joinedUserListTemplate = getTemplate( const joinedUserListTemplate = getTemplate(
...@@ -474,7 +476,7 @@ CollaborationUI.refreshJoinedCollaboration = function (loginIDList) { ...@@ -474,7 +476,7 @@ CollaborationUI.refreshJoinedCollaboration = function (loginIDList) {
let obj = jQuery.parseHTML(html); let obj = jQuery.parseHTML(html);
$("#collaboration_overlay_user_list").append(obj); $("#collaboration_overlay_user_list").append(obj);
Common.dismissLoadingIndicator(); CollaborationFeature.updateHost();
}; };
CollaborationUI.moveToVideoShareArea = function () { CollaborationUI.moveToVideoShareArea = 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