バグ修正。

public_new/chat_make_room.html

@@ -51,9 +51,9 @@
 
 
       <!-- タブ -->
       <!-- タブ -->
       <div class="content tabs">
       <div class="content tabs">
-        <input id="tabMyGroupOnMakeRoom" type="radio" name="tab_item" checked>
+        <input id="tabMyGroupOnMakeRoom" type="radio" name="tab_item">
         <label class="tab_item" for="tabMyGroupOnMakeRoom">マイグループ</label>
         <label class="tab_item" for="tabMyGroupOnMakeRoom">マイグループ</label>
-        <input id="tabAllGroupOnMakeRoom" type="radio" name="tab_item">
+        <input id="tabAllGroupOnMakeRoom" type="radio" name="tab_item" checked>
         <label class="tab_item" for="tabAllGroupOnMakeRoom">全グループ</label>
         <label class="tab_item" for="tabAllGroupOnMakeRoom">全グループ</label>
         <div class="tab_content" id="tab1_content">
         <div class="tab_content" id="tab1_content">
           <div class="chat_list">
           <div class="chat_list">
@@ -174,7 +174,7 @@
       } else {
       } else {
         $('.select_member_num').text('0');
         $('.select_member_num').text('0');
       }
       }
-      CHAT_UI.refreshMyGroupForMakeRoom();
+      CHAT_UI.refreshAllGroupForMakeRoom(groupSearchFlg.ALL);
     };
     };
   </script>
   </script>
 </body>
 </body>

public_new/js/chat-ui.js

@@ -1238,6 +1238,7 @@ $('#tabGroup').on('click', function(e) {
     CHAT_UI.refreshRoomList(chatRoomType.GROUP);
     CHAT_UI.refreshRoomList(chatRoomType.GROUP);
 });
 });
 
 
+
 $('#tabAllGroup').on('click', function(e) {
 $('#tabAllGroup').on('click', function(e) {
     CHAT_UI.refreshAllGroupSearch('0');
     CHAT_UI.refreshAllGroupSearch('0');
 });
 });
@@ -1264,6 +1265,10 @@ $('#addUserConfirmBtn').on('click', function(e) {
     $('#addUserForm').submit();
     $('#addUserForm').submit();
 });
 });
 
 
+CHAT_UI.roomDisplayOff = function() {
+    android.roomDisplayOff();
+}
+
 CHAT_UI.favoriteUserChange = function(shopMemberId, star) {
 CHAT_UI.favoriteUserChange = function(shopMemberId, star) {
     if ($(star).hasClass('active')) {
     if ($(star).hasClass('active')) {
         CHAT_UI.removeFavoriteUser(shopMemberId);
         CHAT_UI.removeFavoriteUser(shopMemberId);
@@ -1291,17 +1296,22 @@ CHAT_UI.removeFavoriteUser = function(shopMemberId) {
 };
 };
 
 
 CHAT_UI.insertFavoriteUser = function(shopMemberId) {
 CHAT_UI.insertFavoriteUser = function(shopMemberId) {
-    CHAT_UI.showLoadingIndicator();
     $('#userNameCard').modal('hide');
     $('#userNameCard').modal('hide');
     $('#myNameCard').modal('hide');
     $('#myNameCard').modal('hide');
-    android.addFavoriteUser(shopMemberId);
-    $('.shopmember_'+shopMemberId).removeClass('disable');
-    $('.shopmember_'+shopMemberId).addClass('active');
+    var result = android.addFavoriteUser(shopMemberId);
+    if (!result) {
+        $('.shopmember_'+groupId).addClass('disable');
+        $('.shopmember_'+groupId).removeClass('active');
+        CHAT_UI.dismissLoadingIndicator();
+        return;
+    } else {
+        $('.shopmember_'+groupId).removeClass('disable');
+        $('.shopmember_'+groupId).addClass('active');
+    }
     CHAT_UI.dismissLoadingIndicator();
     CHAT_UI.dismissLoadingIndicator();
 };
 };
 
 
 CHAT_UI.removeFavoriteGroup = function(groupId) {
 CHAT_UI.removeFavoriteGroup = function(groupId) {
-    CHAT_UI.showLoadingIndicator();
     android.removeFavoriteGroup(groupId);
     android.removeFavoriteGroup(groupId);
     $('.group_'+groupId).removeClass('active');
     $('.group_'+groupId).removeClass('active');
     $('.group_'+groupId).addClass('disable');
     $('.group_'+groupId).addClass('disable');
@@ -1310,9 +1320,16 @@ CHAT_UI.removeFavoriteGroup = function(groupId) {
 
 
 CHAT_UI.insertFavoriteGroup = function(groupId) {
 CHAT_UI.insertFavoriteGroup = function(groupId) {
     CHAT_UI.showLoadingIndicator();
     CHAT_UI.showLoadingIndicator();
-    android.addFavoriteGroup(groupId);
+    var result = android.addFavoriteGroup(groupId);
+    if (!result) {
+        $('.group_'+groupId).addClass('disable');
+        $('.group_'+groupId).removeClass('active');
+        CHAT_UI.dismissLoadingIndicator();
+        return;
+    } else {
         $('.group_'+groupId).removeClass('disable');
         $('.group_'+groupId).removeClass('disable');
         $('.group_'+groupId).addClass('active');
         $('.group_'+groupId).addClass('active');
+    }
     CHAT_UI.dismissLoadingIndicator();
     CHAT_UI.dismissLoadingIndicator();
 };
 };
 
 

public_new/js/common.js

@@ -53,6 +53,7 @@ $(function() {
   $('.message_input_form').click(function(){
   $('.message_input_form').click(function(){
     $('.message_input_send').removeClass('none');
     $('.message_input_send').removeClass('none');
     $('.attach_file').addClass('none');
     $('.attach_file').addClass('none');
+    $('.footer_content_b').addClass('none');
   });
   });
 
 
  $('.message_input_form').on('focusout',function(e){
  $('.message_input_form').on('focusout',function(e){
@@ -61,6 +62,7 @@ $(function() {
     }
     }
     $('.message_input_send').addClass('none');
     $('.message_input_send').addClass('none');
     $('.attach_file').removeClass('none');
     $('.attach_file').removeClass('none');
+    $('.footer_content_b').removeClass('none');
   });
   });
 
 
 });
 });

public_new/js/constant.js

@@ -27,6 +27,10 @@ const chatRoomType = {
     ALL : "2"
     ALL : "2"
 }
 }
 
 
+const groupSearchFlg = {
+    ROOT : "0"
+}
+
 const nameCardAreaId = {
 const nameCardAreaId = {
     MY : "myNamecard",
     MY : "myNamecard",
     USER : "userNamecard"
     USER : "userNamecard"

public_new/modal_chat_menu.html

@@ -11,6 +11,7 @@
         <ul>
         <ul>
           <li><a href="chat_change_room_name.html"><img src="icon/icon_change_room_name.png" alt="ルーム名変更">ルーム名変更</a></li>
           <li><a href="chat_change_room_name.html"><img src="icon/icon_change_room_name.png" alt="ルーム名変更">ルーム名変更</a></li>
           <li><a href="chat_add_user.html"><img src="icon/icon_add_user.png" alt="ユーザー招待">ユーザー招待</a></li>
           <li><a href="chat_add_user.html"><img src="icon/icon_add_user.png" alt="ユーザー招待">ユーザー招待</a></li>
+          <li ><a href="javascript:return false;" onclick="CHAT_UI.roomDisplayOff();"><img src="icon/icon_chat_gray.png" alt="ユーザー招待">部屋非表示</a></li>
         </ul>
         </ul>
       </div>
       </div>
     </div>
     </div>