Merge branch 'release_sp3' of gitlab.agentec.jp:abookCommunication/chat_webview into release_sp3

public_new/chat.html

@@ -133,6 +133,7 @@
     } else {
     } else {
       webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
       webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
       webkit.messageHandlers.getGlobalParameter.postMessage({});
       webkit.messageHandlers.getGlobalParameter.postMessage({});
+      webkit.messageHandlers.saveSelectedUserList.postMessage("");
     }
     }
     function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
     function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
       CHAT_SERVER_URL = chatServerUrl;
       CHAT_SERVER_URL = chatServerUrl;

public_new/js/chat-ui.js

@@ -1335,8 +1335,7 @@ $('#makeRoomConfirmBtn').on('click', function(e) {
     if (typeof(android) != "undefined") {
     if (typeof(android) != "undefined") {
         android.saveSelectedUserList(CHAT.globalSelectedUserList.join(","));
         android.saveSelectedUserList(CHAT.globalSelectedUserList.join(","));
     } else {
     } else {
-        var userList = CHAT.globalSelectedUserList.join(",");
-        webkit.messageHandlers.saveSelectedUserList.postMessage(userList);
+        webkit.messageHandlers.saveSelectedUserList.postMessage(CHAT.globalSelectedUserList.join(","));
     }
     }
     $('#makeRoomForm').submit();
     $('#makeRoomForm').submit();
 });
 });
@@ -1345,8 +1344,7 @@ $('#addUserConfirmBtn').on('click', function(e) {
     if (typeof(android) != "undefined") {
     if (typeof(android) != "undefined") {
         android.saveSelectedUserList(CHAT.globalSelectedUserList.join(","));
         android.saveSelectedUserList(CHAT.globalSelectedUserList.join(","));
     } else {
     } else {
-        var userList = CHAT.globalSelectedUserList.join(",");
-        webkit.messageHandlers.saveSelectedUserList.postMessage(userList);
+        webkit.messageHandlers.saveSelectedUserList.postMessage(CHAT.globalSelectedUserList.join(","));
     }
     }
     $('#addUserForm').submit();
     $('#addUserForm').submit();
 });
 });
@@ -2096,7 +2094,7 @@ CHAT_UI.showMakeRoomConfirmView = function() {
              if (typeof(android) != "undefined") {
              if (typeof(android) != "undefined") {
                 android.createChatRoom("1", userIdList.join(','), trimmedRoomName, makeRoomFlg.MAKE_ROOM);
                 android.createChatRoom("1", userIdList.join(','), trimmedRoomName, makeRoomFlg.MAKE_ROOM);
              } else {
              } else {
-                webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": newRoomName, "screenFlg": makeRoomFlg.MAKE_ROOM});
+                webkit.messageHandlers.createChatRoom.postMessage({"roomType": "1", "userIdList": userIdList.join(','), "roomName": trimmedRoomName, "screenFlg": makeRoomFlg.MAKE_ROOM});
              }
              }
          }
          }
      });
      });

public_new/js/chat.js

@@ -251,14 +251,6 @@ CHAT.leaveRoom = function() {
 }
 }
 
 
 $(function() {
 $(function() {
-    // ルーム人数選択確認イベント
-    $('.make_room_btn button').click(function(){
-        $('form').submit();
-    });
-    // ルーム人数選択イベント
-    $('.make_room_confirm_btn button').click(function(){
-        $('form').submit();
-    });
     // ユーザー追加確認イベント
     // ユーザー追加確認イベント
     $('.add_user_confirm_btn button').click(function(){
     $('.add_user_confirm_btn button').click(function(){
         $('form').submit();
         $('form').submit();