Merge branch 'bug/#43946_room_create_zero_selected' into 'develop'

Bug/#43946 room create zero selected

See merge request !232

public_new/chat_add_user.html

@@ -21,22 +21,22 @@
   <!-- ナビメニュー -->
   <!-- ナビメニュー -->
   <nav>
   <nav>
     <div class="row h-100 align-items-center">
     <div class="row h-100 align-items-center">
-      <div class="col-10 pr-0">
+      <div class="col-4 pr-0">
         <div class="nav-item">
         <div class="nav-item">
           <div class="nav_prev">
           <div class="nav_prev">
             <a href="chat_room.html"><span>ルーム</span></a>
             <a href="chat_room.html"><span>ルーム</span></a>
           </div>
           </div>
         </div>
         </div>
-        <div class="col-4 p-0">
-          <div class="nav-item p-0">
-            <h1 class="nav-ttl" id="addUserTitle">ユーザー招待</h1>
-          </div>
+      </div>
+      <div class="col-4 p-0">
+        <div class="nav-item p-0">
+          <h1 class="nav-ttl" id="addUserTitle">ユーザー招待</h1>
         </div>
         </div>
-        <div class="col-4 pl-0">
-          <div class="nav-item text-right">
-          </div>
-        </div><!-- .col -->
-      </div><!-- .row -->
+      </div>
+      <div class="col-4 pl-0">
+        <div class="nav-item text-right"></div>
+      </div><!-- .col -->
+    </div><!-- .row -->
   </nav><!-- nav -->
   </nav><!-- nav -->
 
 
   <!-- コンテンツ -->
   <!-- コンテンツ -->
@@ -119,7 +119,7 @@
         </ul>
         </ul>
       </div>
       </div>
       <!-- ルーム解説ボタン -->
       <!-- ルーム解説ボタン -->
-      <div class="make_room_confirm_btn content" id="addUserConfirmBtn">
+      <div class="make_room_confirm_btn" id="addUserConfirmBtn">
         <button type="button" name="button">
         <button type="button" name="button">
           確認<br>
           確認<br>
           <span class="select_member_num"></span><span class="select_member">名 選択中</span></button>
           <span class="select_member_num"></span><span class="select_member">名 選択中</span></button>

public_new/chat_make_room.html

@@ -120,7 +120,7 @@
       </div>
       </div>
 
 
       <!-- ルーム解説ボタン -->
       <!-- ルーム解説ボタン -->
-      <div class="make_room_confirm_btn content" id="makeRoomConfirmBtn">
+      <div class="make_room_confirm_btn" id="makeRoomConfirmBtn">
         <button type="button" name="button">
         <button type="button" name="button">
           ルーム開設<br>
           ルーム開設<br>
           <span class="select_member_num"></span><span class="select_member">名 選択中</span></button>
           <span class="select_member_num"></span><span class="select_member">名 選択中</span></button>

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

@@ -61,6 +61,9 @@ document.addEventListener("DOMContentLoaded", function () {
 
 
   // 下スクロールでユーザーリストを非表示
   // 下スクロールでユーザーリストを非表示
   ChatRoom.bindUserListDisplayToggle();
   ChatRoom.bindUserListDisplayToggle();
+
+  // invite button イベントバインディング
+  ChatRoom.bindUserInviteButton();
 });
 });
 
 
 ChatRoom.bindResize = function () {
 ChatRoom.bindResize = function () {
@@ -143,6 +146,12 @@ ChatRoom.bindUserListDisplayToggle = function () {
   });
   });
 };
 };
 
 
+ChatRoom.bindUserInviteButton = function () {
+  $("#add_user_button").on("click", function(e) {
+    NativeBridgeDelegate.showLoadingIndicator();
+  });
+};
+
 // 画像の読み込みが全て終わったタイミングでコールバック実行
 // 画像の読み込みが全て終わったタイミングでコールバック実行
 // FIXME 追加読み込みの場合は差分の画像のみ監視すべきだが、現状新規入室時にしか対応出来ていない。
 // FIXME 追加読み込みの場合は差分の画像のみ監視すべきだが、現状新規入室時にしか対応出来ていない。
 ChatRoom.waitForLoadingVideo = function (div, callback) {
 ChatRoom.waitForLoadingVideo = function (div, callback) {

public_new/js/views/chats/management/chat-add-user.js

@@ -36,7 +36,7 @@ ChatAddUser.searchUser = function (keyword) {
   } else {
   } else {
     const userList =
     const userList =
       NativeBridgeDataSource.getMyGroupShopMemberNotInRoomByName(keyword);
       NativeBridgeDataSource.getMyGroupShopMemberNotInRoomByName(keyword);
-    searchUserData(userList, overlayMessage);
+    ChatAddUser.searchUserData(userList, overlayMessage);
     hasNoData = userList.length == 0;
     hasNoData = userList.length == 0;
   }
   }
   // Set NoResult
   // Set NoResult
@@ -352,7 +352,6 @@ ChatAddUser.appendUserInGroup = function (groupUserList) {
 };
 };
 
 
 ChatAddUser.toggleCategory = function (category) {
 ChatAddUser.toggleCategory = function (category) {
-  console.log("peacekim:: ChatAddUser.toggleCategory");
   $(category).toggleClass("open");
   $(category).toggleClass("open");
   $(category).next().slideToggle();
   $(category).next().slideToggle();
-};
+};
\ No newline at end of file

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

@@ -139,6 +139,9 @@ ChatMakeRoom.renderUser = function (url, userList) {
 
 
 $("#makeRoomConfirmBtn").on("click", function (e) {
 $("#makeRoomConfirmBtn").on("click", function (e) {
   const selectedUserList = ChatManagementCommon.selectedUserList.join(",");
   const selectedUserList = ChatManagementCommon.selectedUserList.join(",");
+  if (selectedUserList.length == 0) {
+    return;
+  }
   NativeBridgeDelegate.saveSelectedUserList(selectedUserList);
   NativeBridgeDelegate.saveSelectedUserList(selectedUserList);
   $("#makeRoomForm").submit();
   $("#makeRoomForm").submit();
 });
 });

public_new/js/views/contact/contact.js

@@ -382,7 +382,6 @@ Contact.appendUsersInGroup = function (userList) {
 };
 };
 
 
 Contact.toggleCategory = function (category) {
 Contact.toggleCategory = function (category) {
-  console.log("peacekim:: Contact.toggleCategory");
   $(category).toggleClass("open");
   $(category).toggleClass("open");
   $(category).next().slideToggle();
   $(category).next().slideToggle();
 };
 };
\ No newline at end of file