Commit 8a3fd7c2 by Lee Munkyeong

Merge branch 'feature/43027_協業中のオフライン' into 'develop'

オフラインの時の協業終了

See merge request !158
parents 9ad2bc0d 06755e21
...@@ -2563,6 +2563,26 @@ CHAT_UI.refreshForOffline = function() { ...@@ -2563,6 +2563,26 @@ CHAT_UI.refreshForOffline = function() {
$('#room_name_change_button').addClass('ui-state-disabled'); $('#room_name_change_button').addClass('ui-state-disabled');
$('#add_user_button').addClass('ui-state-disabled'); $('#add_user_button').addClass('ui-state-disabled');
$('.fa-download').hide(); $('.fa-download').hide();
if (typeof coview_api == "undefined") { return }
var alertString = "";
if (g_isMainMan) {
alertString = getLocalizedString("err_weak_network_exit_collaboration")
} else {
alertString = getLocalizedString("err_weak_network_exit_collaboration")
}
alert(alertString);
if (collaborationJoinFlg != '2') {
CHAT_UI.joinRoom(
CHAT.globalLoginParameter.roomId,
CHAT.globalLoginParameter.name
);
} else {
if (typeof android != "undefined") {
android.openCommunicationHome();
} else {
webkit.messageHandlers.openCommunicationHome.postMessage({});
}
}
} }
CHAT_UI.offlineHandler = function(e) { CHAT_UI.offlineHandler = function(e) {
......
...@@ -101,5 +101,6 @@ $.lang.en = { ...@@ -101,5 +101,6 @@ $.lang.en = {
"err_not_exist_room" : "this room is not exist.", "err_not_exist_room" : "this room is not exist.",
"norify_request_host_change" : "%@ request host permission \ndo you want to approve?", "norify_request_host_change" : "%@ request host permission \ndo you want to approve?",
"error_send_video": "Fail to send.", "error_send_video": "Fail to send.",
"already_processing_host_request" : "already processing host request" "already_processing_host_request" : "already processing host request",
"err_weak_network_exit_collaboration" : "network is weak. end Collaboration"
} }
...@@ -101,5 +101,6 @@ $.lang.ja = { ...@@ -101,5 +101,6 @@ $.lang.ja = {
"err_not_exist_room" : "該当のルームが存在しません。", "err_not_exist_room" : "該当のルームが存在しません。",
"norify_request_host_change" : "%@様からホスト変更リクエストがあります。\n承認しますか?", "norify_request_host_change" : "%@様からホスト変更リクエストがあります。\n承認しますか?",
"error_send_video": "送信に失敗しました。", "error_send_video": "送信に失敗しました。",
"already_processing_host_request" : "既にホストリクエストが進行中です。" "already_processing_host_request" : "既にホストリクエストが進行中です。",
"err_weak_network_exit_collaboration" : "ネットワーク信号が弱いです。協業を終了します。"
} }
\ No newline at end of file
...@@ -101,5 +101,6 @@ $.lang.ko = { ...@@ -101,5 +101,6 @@ $.lang.ko = {
"err_not_exist_room" : "해당 룸이 존재하지않습니다.", "err_not_exist_room" : "해당 룸이 존재하지않습니다.",
"norify_request_host_change" : "%@님이 호스트변경을 요청하셨습니다.\n승인하시겠습니까?", "norify_request_host_change" : "%@님이 호스트변경을 요청하셨습니다.\n승인하시겠습니까?",
"error_send_video": "전송에 실패했습니다.", "error_send_video": "전송에 실패했습니다.",
"already_processing_host_request" : "이미 호스트요청이 진행중입니다." "already_processing_host_request" : "이미 호스트요청이 진행중입니다.",
"err_weak_network_exit_collaboration" : "네트워크신호가 약합니다. 협업을 정리하겠습니다."
} }
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