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
214b36dc
Commit
214b36dc
authored
Aug 03, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed add users in collaboration ui
parent
af6ab7c4
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
20 deletions
+31
-20
public_new/css/chat.css
+3
-0
public_new/css/collaboration.css
+1
-1
public_new/js/views/collaboration/collaboration-add-user.js
+6
-1
public_new/js/views/collaboration/collaboration.js
+11
-11
public_new/modal_add_user_confirm.html
+9
-6
public_new/modal_add_user_list.html
+1
-1
No files found.
public_new/css/chat.css
View file @
214b36dc
...
...
@@ -73,6 +73,9 @@ input[name="tab_item"] {
width
:
90px
;
max-height
:
60px
;
}
#addUserFormInCollaboration
.chat_list
li
{
border-bottom
:
1px
solid
#e2e8f0
;
}
.chat_list
ul
li
{
list-style
:
none
;
border-bottom
:
1px
solid
#e2e8f0
;
...
...
public_new/css/collaboration.css
View file @
214b36dc
...
...
@@ -794,7 +794,7 @@
}
#selectedUserListinCollaboration
{
height
:
400px
;
height
:
50vh
;
overflow
:
scroll
;
}
...
...
public_new/js/views/collaboration/collaboration-add-user.js
View file @
214b36dc
...
...
@@ -9,6 +9,11 @@ CollaborationUI.initialBindAddUserButton = function () {
.
off
()
.
on
(
"click"
,
function
()
{
$
(
"#addUserInCollaboration"
).
modal
(
"hide"
);
if
(
ChatManagementCommon
.
selectedUserList
.
length
==
0
)
{
return
;
}
const
selectedUserList
=
ChatManagementCommon
.
selectedUserList
.
join
(
","
);
NativeBridgeDelegate
.
saveSelectedUserList
(
selectedUserList
);
...
...
@@ -296,7 +301,7 @@ CollaborationUI.bindAddUserButton = function (selectedUsers) {
let
userIDList
=
selectedUsers
.
map
((
user
)
=>
user
.
shopMemberId
);
const
commaJoinedUserIDList
=
userIDList
.
join
(
","
);
const
collaborationType
=
globalUserInfo
.
collaborationType
;
scrollTo
(
0
,
0
);
NativeBridgeDelegate
.
inviteCollaboration
(
commaJoinedUserIDList
,
collaborationType
...
...
public_new/js/views/collaboration/collaboration.js
View file @
214b36dc
...
...
@@ -12,14 +12,16 @@ document.addEventListener("DOMContentLoaded", function () {
// モーダルonモーダル(前のモーダルを非表示に)
// ホスト変更ボタン押下イベント
CollaborationUI
.
bindChangeHostButton
();
});
// 閉じるイベント
CollaborationUI
.
bindCloseButton
();
// ユーザー追加イベント
CollaborationUI
.
bindInviteButton
();
CollaborationUI
.
initialBindAddUserButton
();
document
.
addEventListener
(
"readystatechange"
,
()
=>
{
if
(
document
.
readyState
===
"complete"
)
{
CollaborationUI
.
initialBindAddUserButton
();
// 閉じるイベント
CollaborationUI
.
bindCloseButton
();
// ユーザー追加イベント
CollaborationUI
.
bindInviteButton
();
}
});
/*********************************
...
...
@@ -73,16 +75,14 @@ CollaborationUI.bindChangeHostButton = function () {
CollaborationUI
.
bindCloseButton
=
function
()
{
$
(
".close_btn"
).
click
(
function
()
{
$
(
"#add_user_list"
).
addClass
(
"none"
);
$
(
".modal-backdrop"
).
addClass
(
"none"
);
scrollTo
(
0
,
0
);
CollaborationUI
.
bindDisableScroll
();
});
};
CollaborationUI
.
bindInviteButton
=
function
()
{
$
(
".inv_btn"
).
click
(
function
()
{
$
(
"#add_user_list"
).
addClass
(
"none"
);
scrollTo
(
0
,
0
);
});
};
...
...
public_new/modal_add_user_confirm.html
View file @
214b36dc
<div
class=
"modal fade add_user_confirm_modal"
id=
"modalAddUserConfirm"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"modalAddUserConfirm"
aria-hidden=
"true"
style=
"position: fixed
;"
>
<div
class=
"modal-dialog modal-dialog-centered modal_collaboration_user"
role=
"document"
>
<div
class=
"modal-content"
style=
"
position: fixed;top: 0;height: 100%;width: 100%;left:0;right: 0;margin: 0 auto
;"
>
aria-labelledby=
"modalAddUserConfirm"
aria-hidden=
"true"
style=
"position: fixed; overflow-y: hidden
;"
>
<div
class=
"modal-dialog modal-dialog-centered modal_collaboration_user"
role=
"document"
style=
"max-width: 100%;"
>
<div
class=
"modal-content"
style=
"
height:70vh; width:90vw
;"
>
<div
class=
"modal-header border-0 pb-0"
>
<span
class=
"m-auto"
>
ユーザー招待
</span>
</div>
...
...
@@ -16,7 +16,8 @@
<div
class=
"chat_item d-flex flex-row align-items-center w-100"
>
<div
class=
"chat_item_l"
>
<div
class=
"thumbnail"
>
<div
class=
"img_wrap"
><img
src=
"{{profileUrl}}"
onError=
"this.src='./img/noImage.png'"
/></div>
<div
class=
"img_wrap"
><img
src=
"{{profileUrl}}"
onError=
"this.src='./img/noImage.png'"
/></div>
</div>
</div>
<div
class=
"chat_item_m px-0"
>
...
...
@@ -34,8 +35,10 @@
</ul>
</div>
</div>
<div
class=
"modal-footer border-0 justify-content-center"
style=
"position: relative;width: 100%;background-color: white;"
>
<button
type=
"button"
id=
"cancelAddUserBtn"
class=
"profile_favorite_btn bg_white border_gray text_blue cancel_add_user_btn"
>
<div
class=
"modal-footer border-0 justify-content-center"
style=
"position: relative;width: 100%;background-color: white;"
>
<button
type=
"button"
id=
"cancelAddUserBtn"
class=
"profile_favorite_btn bg_white border_gray text_blue cancel_add_user_btn"
>
<div
class=
"d-flex flex-column"
>
<span>
キャンセル
</span>
</div>
...
...
public_new/modal_add_user_list.html
View file @
214b36dc
<!-- コンテンツ -->
<div
class=
"modal fade add_user_modal"
id=
"addUserInCollaboration"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"addUserInCollaboration"
aria-hidden=
"true"
>
<div
class=
"modal-dialog
-centered modal_collaboration_user"
role=
"document
"
>
<div
class=
"modal-dialog
modal-dialog-centered modal_collaboration_user"
role=
"document"
style=
"max-width: 100%;
"
>
<div
class=
"modal-content"
>
<form
id=
"addUserFormInCollaboration"
action=
"chat_add_user_confirm.html"
method=
"post"
>
<!-- ユーザー検索 -->
...
...
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