Merge branch 'develop' into refactoring/join_collaboration

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

@@ -49,7 +49,7 @@ ChatList.bindChatSearch = function () {
 
 
   // iOSキーボード変換検知用
   // iOSキーボード変換検知用
   chatSearchInput.on("compositionend", function () {
   chatSearchInput.on("compositionend", function () {
-    if (deviceInfo.isIOS()) {
+    if (deviceInfo.isiOS()) {
       var rooms;
       var rooms;
       var keyword = chatSearchInput.val();
       var keyword = chatSearchInput.val();
       ChatList.searchRoom(keyword, rooms);
       ChatList.searchRoom(keyword, rooms);

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

@@ -76,7 +76,7 @@ ChatRoom.bindSearchUI = function () {
 
 
   // iOSキーボード変換検知用
   // iOSキーボード変換検知用
   chatSearchInput.on("compositionend", function () {
   chatSearchInput.on("compositionend", function () {
-    if (deviceInfo.isIOS()) {
+    if (deviceInfo.isiOS()) {
       let workVal = "";
       let workVal = "";
       var keyword = chatSearchInput.val();
       var keyword = chatSearchInput.val();
       ChatRoom.searchMessage(keyword, workVal);
       ChatRoom.searchMessage(keyword, workVal);

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

@@ -63,7 +63,7 @@ ChatRoom.bindResize = function () {
       }
       }
     } else if (beforeHeight < afterHeight) {
     } else if (beforeHeight < afterHeight) {
       $(".room_container").css("margin-bottom", footerHeight);
       $(".room_container").css("margin-bottom", footerHeight);
-      if (deviceInfo.isIOS()) {
+      if (deviceInfo.isiOS()) {
         window.scrollTo(0, beforeScroll + moreScroll);
         window.scrollTo(0, beforeScroll + moreScroll);
       } else if (beforeWidth == afterWidth) {
       } else if (beforeWidth == afterWidth) {
         //キーボード非表示
         //キーボード非表示

public_new/js/views/contact/contact.js

@@ -257,11 +257,6 @@ Contact.insertFavoriteGroup = function (groupID) {
 //全グループ検索画面表示。
 //全グループ検索画面表示。
 Contact.refreshAllGroupSearch = function (paramGroupID) {
 Contact.refreshAllGroupSearch = function (paramGroupID) {
   const groupID = paramGroupID;
   const groupID = paramGroupID;
-  if (window.location.pathname.includes("chat_room")) {
-    if (groupID == "") return;
-    NativeBridgeDelegate.setToMoveGroupId(groupID);
-    window.location.href = "contact.html";
-  }
 
 
   Common.showLoadingIndicator();
   Common.showLoadingIndicator();
 
 

public_new/js/views/contact/namecard.js

@@ -106,3 +106,14 @@ Namecard.refreshForOnline = function () {
 Namecard.refreshForOffline = function () {
 Namecard.refreshForOffline = function () {
   $("#favoriteButton").prop("disabled", true);
   $("#favoriteButton").prop("disabled", true);
 };
 };
+
+Namecard.moveContactPage = function (paramGroupID) {
+  const groupID = paramGroupID;
+  if (window.location.pathname.includes("chat_room") ||
+        window.location.pathname.includes("archive_detail"))
+  {
+    if (groupID == "") return;
+    NativeBridgeDelegate.setToMoveGroupId(groupID);
+    window.location.href = "contact.html";
+  }
+}

public_new/template/template_user_name_card.html

@@ -14,7 +14,7 @@
         </div>
         </div>
         <div class="modal-body" id="userNameCard-scroll">
         <div class="modal-body" id="userNameCard-scroll">
           {{#groupPathList}}
           {{#groupPathList}}
-          <li onclick="Contact.refreshAllGroupSearch({{groupId}});"><b>{{groupPath}}</b></li>
+          <li onclick="Namecard.moveContactPage({{groupId}});"><b>{{groupPath}}</b></li>
           {{/groupPathList}}
           {{/groupPathList}}
         </div>
         </div>
         <div class="modal-footer border-0 justify-content-center">
         <div class="modal-footer border-0 justify-content-center">