Commit ea1457f8 by Takatoshi Miura

Merge branch 'communication/#43065_collaboration-alert' into 'develop'

#43065_collaboration-alert_既に協業ルームが存在しない場合退室する処理を追加

See merge request !189
parents 15927c8a d5d16bec
......@@ -99,6 +99,7 @@ $.lang.en = {
"host_change_notify" : "host changed to %@",
"not_support_version" : "did not support this device version.",
"err_target_android_version_not_support" : "did not support document collaboration on this user's device version.",
"not_exist_sharing_call": "Collaboration room was not found. Return to the chat room.",
"err_not_exist_room" : "this room is not exist.",
"norify_request_host_change" : "%@ request host permission \ndo you want to approve?",
"already_exist_collaboration" : "already exist collaboration. do you want finish already exist collaboration and start new one?",
......
......@@ -99,6 +99,7 @@ $.lang.ja = {
"host_change_notify" : "ホストが%@様に変更されました。",
"not_support_version" : "現在の端末バージョンでは利用できません。",
"err_target_android_version_not_support" : "対象ユーザの端末バージョンでは文書協業が利用できません。",
"not_exist_sharing_call": "協業ルームが見つかりませんでした。チャットルームに戻ります。",
"err_not_exist_room" : "該当のルームが存在しません。",
"norify_request_host_change" : "%@様からホスト変更リクエストがあります。\n承認しますか?",
"already_exist_collaboration" : "現在進行中の協業があります。進行中の協業を終了し、新たな協業を開始しますか?",
......
......@@ -99,6 +99,7 @@ $.lang.ko = {
"host_change_notify" : "호스트가 %@님으로 변경되었습니다.",
"not_support_version" : "현재단말버전에서는 지원되지않는기능입니다.",
"err_target_android_version_not_support" : "해당 유저의 단말버전에서는 문서협업이 이용불가능합니다.",
"not_exist_sharing_call": "협업룸을 찾을 수 없습니다. 채팅룸으로 돌아갑니다.",
"err_not_exist_room" : "해당 룸이 존재하지않습니다.",
"norify_request_host_change" : "%@님이 호스트변경을 요청하셨습니다.\n승인하시겠습니까?",
"already_exist_collaboration" : "현재 진행중인 협업이 있습니다. 진행중인 협업을 강제종료하고 새로 개시하시겠습니까?",
......
......@@ -523,17 +523,17 @@ document.addEventListener("DOMContentLoaded", function () {
} else {
}
break;
case "JoinRoomInfoResponse":
case "joinRoomInfoResponse":
if (json.resultCode == 200) {
} else {
alert(
"Not exist sharing call (" +
json.resultCode +
")\nPlease using share menu."
);
alert(getLocalizedString("not_exist_sharing_call"));
coview_api.LeaveRoom();
$(".coview_share_area").hide();
$("#loadingIndicator").removeClass("full_active");
CHAT_UI.joinRoom(
CHAT.globalLoginParameter.roomId,
CHAT.globalLoginParameter.name
);
}
break;
case "JoinRoomResponse":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment