Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
chat_webview
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abookCommunication
chat_webview
Commits
060b7c8c
Commit
060b7c8c
authored
May 11, 2021
by
Takatoshi Miura
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release_sp3_ios_invite_collaboration' into 'release_sp3'
[iOS] 協業招待機能の追加実装 See merge request
!113
parents
ca6ea671
1cc4fb35
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
public_new/js/chat-ui.js
+1
-1
public_new/js/share.js
+5
-1
No files found.
public_new/js/chat-ui.js
View file @
060b7c8c
...
...
@@ -2839,7 +2839,7 @@ CHAT_UI.confirmInviteUserListInCollaboration = function() {
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
inviteCollaboration
(
userIdList
.
join
(
','
),
CHAT_UTIL
.
getCollaborationType
(
globalUserInfo
.
coWorkType
));
}
else
{
webkit
.
messageHandlers
.
invite
Users
.
postMessage
({
"userIdList"
:
userIdList
.
join
(
','
)});
webkit
.
messageHandlers
.
invite
Collaboration
.
postMessage
({
"userIdList"
:
userIdList
.
join
(
','
),
"collaborationType"
:
CHAT_UTIL
.
getCollaborationType
(
globalUserInfo
.
coWorkType
)});
}
$
(
'#modalAddUserConfirm'
).
modal
(
'hide'
);
});
...
...
public_new/js/share.js
View file @
060b7c8c
...
...
@@ -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
({});
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment