Merge branch 'develop' into debug/console_logs

public_new/js/views/collaboration/collaboration-add-user.js

@@ -58,7 +58,7 @@ CollaborationUI.refreshMyGroupForAddUserInCollaboration = function () {
 
 
   $("#tabMyGroupOnAddUserInCollaboration").prop("checked", true);
   $("#tabMyGroupOnAddUserInCollaboration").prop("checked", true);
 
 
-  NativeBridgeDelegate.updateContactInfo();
+  CollaborationUI.updateContactInfo();
 
 
   CollaborationUI.appendFavoriteGroupList();
   CollaborationUI.appendFavoriteGroupList();
 
 
@@ -70,6 +70,12 @@ CollaborationUI.refreshMyGroupForAddUserInCollaboration = function () {
   Common.dismissLoadingIndicator();
   Common.dismissLoadingIndicator();
 };
 };
 
 
+CollaborationUI.updateContactInfo = async function () {
+  setTimeout(function () {
+    NativeBridgeDelegate.updateContactInfo();
+  }, 0);
+};
+
 CollaborationUI.appendFavoriteGroupList = function () {
 CollaborationUI.appendFavoriteGroupList = function () {
   console.log("peacekim:: CollaborationUI.appendFavoriteGroupList");
   console.log("peacekim:: CollaborationUI.appendFavoriteGroupList");
   // グループの様式を読み込む
   // グループの様式を読み込む
@@ -151,7 +157,9 @@ CollaborationUI.refreshAllGroupForAddUserInCollaboration = function (groupID) {
 
 
   $("#tabAllGroupOnAddUserInCollaboration").prop("checked", true);
   $("#tabAllGroupOnAddUserInCollaboration").prop("checked", true);
 
 
+  setTimeout(function () {
     NativeBridgeDelegate.updateGroupInfo(groupID);
     NativeBridgeDelegate.updateGroupInfo(groupID);
+  }, 0);
 
 
   //画面エリアを初期化。
   //画面エリアを初期化。
   $("#parentGroupBtnForAddUserInCollaboration").off();
   $("#parentGroupBtnForAddUserInCollaboration").off();

public_new/js/views/collaboration/collaboration.js

 var CollaborationUI = {};
 var CollaborationUI = {};
 
 
+CollaborationUI.openedNamecardUserID = undefined;
+
 document.addEventListener("DOMContentLoaded", function () {
 document.addEventListener("DOMContentLoaded", function () {
   console.log("peacekim:: DOMContentLoaded on collaboration js");
   console.log("peacekim:: DOMContentLoaded on collaboration js");
   CollaborationUI.disableScroll();
   CollaborationUI.disableScroll();
@@ -155,6 +157,8 @@ CollaborationUI.makeNameCard = function (shopMemberID) {
     collaborationId: globalUserInfo.shopName + "_" + nameCardInfo.loginId,
     collaborationId: globalUserInfo.shopName + "_" + nameCardInfo.loginId,
   });
   });
 
 
+  CollaborationUI.openedNamecardUserID = globalUserInfo.shopName + "_" + nameCardInfo.loginId;
+
   let namecardObj = $(jQuery.parseHTML(namecardHTML)).on(
   let namecardObj = $(jQuery.parseHTML(namecardHTML)).on(
     "click",
     "click",
     function () {}
     function () {}

public_new/js/views/collaboration/share-event-listener.js

@@ -306,7 +306,8 @@ CollaborationFeature.didReceivedJoinRoomInfoResponseMessage = function () {
 };
 };
 
 
 CoviewBridge.changeHostFromModal = function () {
 CoviewBridge.changeHostFromModal = function () {
-  const userID = $("#changeHostModal").data("bs.modal")._config.collaborationid;
+  const userID = CollaborationUI.openedNamecardUserID;
+  
   // call in agent_app.js
   // call in agent_app.js
   coview_api.HostChange(userID);
   coview_api.HostChange(userID);
 };
 };