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
053fd3bb
Commit
053fd3bb
authored
Sep 13, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into debug/console_logs
parents
554beef6
9fdd2c5a
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 @
053fd3bb
...
@@ -58,7 +58,7 @@ CollaborationUI.refreshMyGroupForAddUserInCollaboration = function () {
...
@@ -58,7 +58,7 @@ CollaborationUI.refreshMyGroupForAddUserInCollaboration = function () {
$
(
"#tabMyGroupOnAddUserInCollaboration"
).
prop
(
"checked"
,
true
);
$
(
"#tabMyGroupOnAddUserInCollaboration"
).
prop
(
"checked"
,
true
);
NativeBridgeDelegate
.
updateContactInfo
();
CollaborationUI
.
updateContactInfo
();
CollaborationUI
.
appendFavoriteGroupList
();
CollaborationUI
.
appendFavoriteGroupList
();
...
@@ -70,6 +70,12 @@ CollaborationUI.refreshMyGroupForAddUserInCollaboration = function () {
...
@@ -70,6 +70,12 @@ CollaborationUI.refreshMyGroupForAddUserInCollaboration = function () {
Common
.
dismissLoadingIndicator
();
Common
.
dismissLoadingIndicator
();
};
};
CollaborationUI
.
updateContactInfo
=
async
function
()
{
setTimeout
(
function
()
{
NativeBridgeDelegate
.
updateContactInfo
();
},
0
);
};
CollaborationUI
.
appendFavoriteGroupList
=
function
()
{
CollaborationUI
.
appendFavoriteGroupList
=
function
()
{
console
.
log
(
"peacekim:: CollaborationUI.appendFavoriteGroupList"
);
console
.
log
(
"peacekim:: CollaborationUI.appendFavoriteGroupList"
);
// グループの様式を読み込む
// グループの様式を読み込む
...
@@ -151,7 +157,9 @@ CollaborationUI.refreshAllGroupForAddUserInCollaboration = function (groupID) {
...
@@ -151,7 +157,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 @
053fd3bb
var
CollaborationUI
=
{};
var
CollaborationUI
=
{};
CollaborationUI
.
openedNamecardUserID
=
undefined
;
document
.
addEventListener
(
"DOMContentLoaded"
,
function
()
{
document
.
addEventListener
(
"DOMContentLoaded"
,
function
()
{
console
.
log
(
"peacekim:: DOMContentLoaded on collaboration js"
);
console
.
log
(
"peacekim:: DOMContentLoaded on collaboration js"
);
CollaborationUI
.
disableScroll
();
CollaborationUI
.
disableScroll
();
...
@@ -155,6 +157,8 @@ CollaborationUI.makeNameCard = function (shopMemberID) {
...
@@ -155,6 +157,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 @
053fd3bb
...
@@ -306,7 +306,8 @@ CollaborationFeature.didReceivedJoinRoomInfoResponseMessage = function () {
...
@@ -306,7 +306,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