Commit 060b7c8c by Takatoshi Miura

Merge branch 'release_sp3_ios_invite_collaboration' into 'release_sp3'

[iOS] 協業招待機能の追加実装

See merge request !113
parents ca6ea671 1cc4fb35
......@@ -2839,7 +2839,7 @@ CHAT_UI.confirmInviteUserListInCollaboration = function() {
if (typeof(android) != "undefined") {
android.inviteCollaboration(userIdList.join(','), CHAT_UTIL.getCollaborationType(globalUserInfo.coWorkType));
} else {
webkit.messageHandlers.inviteUsers.postMessage({"userIdList": userIdList.join(',')});
webkit.messageHandlers.inviteCollaboration.postMessage({"userIdList": userIdList.join(','), "collaborationType": CHAT_UTIL.getCollaborationType(globalUserInfo.coWorkType)});
}
$('#modalAddUserConfirm').modal('hide');
});
......
......@@ -241,7 +241,11 @@ function Coview_exitCollaboration() {
if (collaborationJoinFlg != '2') {
CHAT_UI.joinRoom(CHAT.globalLoginParameter.roomId, CHAT.globalLoginParameter.name);
} else {
android.openCommunicationHome();
if (typeof(android) != "undefined") {
android.openCommunicationHome();
} else {
webkit.messageHandlers.openCommunicationHome.postMessage({});
}
}
}
......
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