Merge branch 'bug/#43632_call_button_on_namecard' into 'develop'

Fixed possible to call from name card

See merge request !196

public_new/chat_room.html

@@ -99,32 +99,32 @@
       <div class="footer_content_b">
         <div class="d-flex flex-row justify-content-around h-100">
           <div class="footer_item">
-            <a href="javascript:ChatRoom.startCollaboration(COLLABORATION_TYPE.AUDIO);">
+            <a href="javascript:Common.startCollaboration(COLLABORATION_TYPE.AUDIO);">
               <img src="icon/icon_phone.svg" alt="通話アイコン">
               <p>通話</p>
             </a>
           </div>
           <div class="footer_item">
-            <a href="javascript:ChatRoom.startCollaboration(COLLABORATION_TYPE.DOCUMENT);">
+            <a href="javascript:Common.startCollaboration(COLLABORATION_TYPE.DOCUMENT);">
               <img src="icon/icon_paste.svg" alt="文書アイコン">
               <p>文書</p>
             </a>
           </div>
           <div class="footer_item">
-            <a href="javascript:ChatRoom.startCollaboration(COLLABORATION_TYPE.CAMERA);">
+            <a href="javascript:Common.startCollaboration(COLLABORATION_TYPE.CAMERA);">
               <img src="icon/icon_photo.svg" alt="画像アイコン">
               <p>画像</p>
             </a>
           </div>
           <div class="footer_item">
-            <a href="javascript:ChatRoom.startCollaboration(COLLABORATION_TYPE.VIDEO);">
+            <a href="javascript:Common.startCollaboration(COLLABORATION_TYPE.VIDEO);">
               <img src="icon/icon_movie.svg" alt="動画アイコン">
               <p>動画</p>
             </a>
           </div>
           <!--リリース後開発予定-->
           <div class="footer_item">
-            <a href="javascript:ChatRoom.startCollaboration(COLLABORATION_TYPE.BOARD);">
+            <a href="javascript:Common.startCollaboration(COLLABORATION_TYPE.BOARD);">
               <img src="icon/icon_whiteboard_gray.svg" alt="ホワイトボードアイコン">
               <p>ボード</p>
             </a>

public_new/js/common/common.js

@@ -140,3 +140,26 @@ Common.getProfileImgUrl = function (path) {
     return path;
   }
 };
+
+Common.startCollaboration = function (collaborationType) {
+  if (deviceInfo.isAndroid()) {
+    if (
+      collaborationType == COLLABORATION_TYPE.DOCUMENT &&
+      deviceInfo.androidVersion < ANDROID_SDK_VERSION.O
+    ) {
+      alert(getLocalizedString("not_support_version"));
+      return;
+    }
+  }
+
+  if ($(".collabo_area.start").length != 0) {
+    if (!confirm(getLocalizedString("already_exist_collaboration"))) {
+      Common.dismissLoadingIndicator();
+      return;
+    }
+    const sendData = DATA_MESSAGE_SCHEME + FINISH_ALL_COLLABORATION_SIGNAL;
+    CHAT_SOCKET.emitCreateMessage(sendData, 0);
+    NativeBridgeDelegate.finishAllCollaboration();
+  }
+  NativeBridgeDelegate.startCollaboration(collaborationType);
+};
\ No newline at end of file

public_new/js/sockets/chat-websocket.js

@@ -161,10 +161,9 @@ CHAT_SOCKET.emitJoin = function (
 };
 
 var errorHandlingForEmitJoin = function () {
-  const positiveButton = $("#customAlertOk");
   // #36174
   $("#customAlertTitle").text(err);
-  positiveButton.text(getLocalizedString("yesTitle"));
+  $("#customAlertOk").text(getLocalizedString("yesTitle"));
 
   $("#customAlert")
     .appendTo("body")

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

@@ -132,29 +132,6 @@ $("#messages").scroll(function () {
   }
 });
 
-ChatRoom.startCollaboration = function (collaborationType) {
-  if (deviceInfo.isAndroid()) {
-    if (
-      collaborationType == COLLABORATION_TYPE.DOCUMENT &&
-      deviceInfo.androidVersion < ANDROID_SDK_VERSION.O
-    ) {
-      alert(getLocalizedString("not_support_version"));
-      return;
-    }
-  }
-
-  if ($(".collabo_area.start").length != 0) {
-    if (!confirm(getLocalizedString("already_exist_collaboration"))) {
-      Common.dismissLoadingIndicator();
-      return;
-    }
-    const sendData = DATA_MESSAGE_SCHEME + FINISH_ALL_COLLABORATION_SIGNAL;
-    CHAT_SOCKET.emitCreateMessage(sendData, 0);
-    NativeBridgeDelegate.finishAllCollaboration();
-  }
-  NativeBridgeDelegate.startCollaboration(collaborationType);
-};
-
 // 画像の読み込みが全て終わったタイミングでコールバック実行
 // FIXME 追加読み込みの場合は差分の画像のみ監視すべきだが、現状新規入室時にしか対応出来ていない。
 ChatRoom.waitForLoadingVideo = function (div, callback) {

public_new/template/template_user_name_card.html

@@ -22,7 +22,7 @@
           <button type="button" class="border-0" onclick="Namecard.removeFavoriteUser({{shopMemberId}})"
             id="favoriteButton">
             <div class="d-flex flex-column">
-              <span class="star active shopmember_890" onclick="Namecard.insertFavoriteUser(890, this)"></span>
+              <span class="star active shopmember_{{shopMemberId}}" onclick="Namecard.favoriteUserChange('{{shopMemberId}}', this)"></span>
               <span>お気に入り解除</span>
             </div>
           </button>
@@ -31,7 +31,7 @@
           <button type="button" class="border-0" onclick="Namecard.insertFavoriteUser({{shopMemberId}})"
             id="favoriteButton">
             <div class="d-flex flex-column">
-              <span class="star disable shopmember_3690" onclick="Namecard.favoriteUserChange(3690,this)"></span>
+              <span class="star disable shopmember_{{shopMemberId}}" onclick="Namecard.favoriteUserChange('{{shopMemberId}}', this)"></span>
               <span>お気に入り登録</span>
             </div>
           </button>