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
ff503788
Commit
ff503788
authored
Sep 13, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed to select right person to hand over host permission
parent
03ed6eb8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
3 deletions
+16
-3
public_new/js/views/collaboration/collaboration-add-user.js
+10
-2
public_new/js/views/collaboration/collaboration.js
+4
-0
public_new/js/views/collaboration/share-event-listener.js
+2
-1
No files found.
public_new/js/views/collaboration/collaboration-add-user.js
View file @
ff503788
...
@@ -41,7 +41,7 @@ CollaborationUI.refreshMyGroupForAddUserInCollaboration = function () {
...
@@ -41,7 +41,7 @@ CollaborationUI.refreshMyGroupForAddUserInCollaboration = function () {
$
(
"#tabMyGroupOnAddUserInCollaboration"
).
prop
(
"checked"
,
true
);
$
(
"#tabMyGroupOnAddUserInCollaboration"
).
prop
(
"checked"
,
true
);
NativeBridgeDelegate
.
updateContactInfo
();
CollaborationUI
.
updateContactInfo
();
CollaborationUI
.
appendFavoriteGroupList
();
CollaborationUI
.
appendFavoriteGroupList
();
...
@@ -53,6 +53,12 @@ CollaborationUI.refreshMyGroupForAddUserInCollaboration = function () {
...
@@ -53,6 +53,12 @@ CollaborationUI.refreshMyGroupForAddUserInCollaboration = function () {
Common
.
dismissLoadingIndicator
();
Common
.
dismissLoadingIndicator
();
};
};
CollaborationUI
.
updateContactInfo
=
async
function
()
{
setTimeout
(
function
()
{
NativeBridgeDelegate
.
updateContactInfo
();
},
0
);
};
CollaborationUI
.
appendFavoriteGroupList
=
function
()
{
CollaborationUI
.
appendFavoriteGroupList
=
function
()
{
// グループの様式を読み込む
// グループの様式を読み込む
const
groupTemplate
=
getTemplate
(
const
groupTemplate
=
getTemplate
(
...
@@ -128,7 +134,9 @@ CollaborationUI.refreshAllGroupForAddUserInCollaboration = function (groupID) {
...
@@ -128,7 +134,9 @@ CollaborationUI.refreshAllGroupForAddUserInCollaboration = function (groupID) {
$
(
"#tabAllGroupOnAddUserInCollaboration"
).
prop
(
"checked"
,
true
);
$
(
"#tabAllGroupOnAddUserInCollaboration"
).
prop
(
"checked"
,
true
);
NativeBridgeDelegate
.
updateGroupInfo
(
groupID
);
setTimeout
(
function
()
{
NativeBridgeDelegate
.
updateGroupInfo
(
groupID
);
},
0
);
//画面エリアを初期化。
//画面エリアを初期化。
$
(
"#parentGroupBtnForAddUserInCollaboration"
).
off
();
$
(
"#parentGroupBtnForAddUserInCollaboration"
).
off
();
...
...
public_new/js/views/collaboration/collaboration.js
View file @
ff503788
var
CollaborationUI
=
{};
var
CollaborationUI
=
{};
CollaborationUI
.
openedNamecardUserID
=
undefined
;
document
.
addEventListener
(
"DOMContentLoaded"
,
function
()
{
document
.
addEventListener
(
"DOMContentLoaded"
,
function
()
{
CollaborationUI
.
disableScroll
();
CollaborationUI
.
disableScroll
();
...
@@ -146,6 +148,8 @@ CollaborationUI.makeNameCard = function (shopMemberID) {
...
@@ -146,6 +148,8 @@ CollaborationUI.makeNameCard = function (shopMemberID) {
collaborationId
:
globalUserInfo
.
shopName
+
"_"
+
nameCardInfo
.
loginId
,
collaborationId
:
globalUserInfo
.
shopName
+
"_"
+
nameCardInfo
.
loginId
,
});
});
CollaborationUI
.
openedNamecardUserID
=
globalUserInfo
.
shopName
+
"_"
+
nameCardInfo
.
loginId
;
let
namecardObj
=
$
(
jQuery
.
parseHTML
(
namecardHTML
)).
on
(
let
namecardObj
=
$
(
jQuery
.
parseHTML
(
namecardHTML
)).
on
(
"click"
,
"click"
,
function
()
{}
function
()
{}
...
...
public_new/js/views/collaboration/share-event-listener.js
View file @
ff503788
...
@@ -253,7 +253,8 @@ CollaborationFeature.didReceivedJoinRoomInfoResponseMessage = function () {
...
@@ -253,7 +253,8 @@ CollaborationFeature.didReceivedJoinRoomInfoResponseMessage = function () {
};
};
CoviewBridge
.
changeHostFromModal
=
function
()
{
CoviewBridge
.
changeHostFromModal
=
function
()
{
const
userID
=
$
(
"#changeHostModal"
).
data
(
"bs.modal"
).
_config
.
collaborationid
;
const
userID
=
CollaborationUI
.
openedNamecardUserID
;
// call in agent_app.js
// call in agent_app.js
coview_api
.
HostChange
(
userID
);
coview_api
.
HostChange
(
userID
);
};
};
...
...
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