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
f190b633
Commit
f190b633
authored
Aug 18, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bug/#43946_room_create_zero_selected' into 'develop'
Bug/#43946 room create zero selected See merge request
!232
parents
8d05e556
abf0a41e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
18 deletions
+26
-18
public_new/chat_add_user.html
+11
-11
public_new/chat_make_room.html
+1
-1
public_new/js/views/chats/chat-room.js
+9
-0
public_new/js/views/chats/management/chat-add-user.js
+2
-4
public_new/js/views/chats/management/chat-make-room.js
+3
-0
public_new/js/views/contact/contact.js
+0
-2
No files found.
public_new/chat_add_user.html
View file @
f190b633
...
...
@@ -21,22 +21,22 @@
<!-- ナビメニュー -->
<nav>
<div
class=
"row h-100 align-items-center"
>
<div
class=
"col-
10
pr-0"
>
<div
class=
"col-
4
pr-0"
>
<div
class=
"nav-item"
>
<div
class=
"nav_prev"
>
<a
href=
"chat_room.html"
><span>
ルーム
</span></a>
</div>
</div>
<div
class=
"col-4 p-0"
>
<div
class=
"nav-item
p-0"
>
<h1
class=
"nav-ttl"
id=
"addUserTitle"
>
ユーザー招待
</h1
>
<
/div
>
</div
>
<div
class=
"col-4
p-0"
>
<div
class=
"nav-item p-0"
>
<
h1
class=
"nav-ttl"
id=
"addUserTitle"
>
ユーザー招待
</h1
>
</div>
<div
class=
"col-4 pl-0"
>
<div
class=
"nav-item text-right
"
>
</div>
</div>
<!-- .col -->
</div>
<!-- .row -->
</div
>
<div
class=
"col-4 pl-0
"
>
<div
class=
"nav-item text-right"
>
</div>
</div>
<!-- .col -->
</div>
<!-- .row -->
</nav>
<!-- nav -->
<!-- コンテンツ -->
...
...
@@ -119,7 +119,7 @@
</ul>
</div>
<!-- ルーム解説ボタン -->
<div
class=
"make_room_confirm_btn
content
"
id=
"addUserConfirmBtn"
>
<div
class=
"make_room_confirm_btn"
id=
"addUserConfirmBtn"
>
<button
type=
"button"
name=
"button"
>
確認
<br>
<span
class=
"select_member_num"
></span><span
class=
"select_member"
>
名 選択中
</span></button>
...
...
public_new/chat_make_room.html
View file @
f190b633
...
...
@@ -120,7 +120,7 @@
</div>
<!-- ルーム解説ボタン -->
<div
class=
"make_room_confirm_btn
content
"
id=
"makeRoomConfirmBtn"
>
<div
class=
"make_room_confirm_btn"
id=
"makeRoomConfirmBtn"
>
<button
type=
"button"
name=
"button"
>
ルーム開設
<br>
<span
class=
"select_member_num"
></span><span
class=
"select_member"
>
名 選択中
</span></button>
...
...
public_new/js/views/chats/chat-room.js
View file @
f190b633
...
...
@@ -61,6 +61,9 @@ document.addEventListener("DOMContentLoaded", function () {
// 下スクロールでユーザーリストを非表示
ChatRoom
.
bindUserListDisplayToggle
();
// invite button イベントバインディング
ChatRoom
.
bindUserInviteButton
();
});
ChatRoom
.
bindResize
=
function
()
{
...
...
@@ -143,6 +146,12 @@ ChatRoom.bindUserListDisplayToggle = function () {
});
};
ChatRoom
.
bindUserInviteButton
=
function
()
{
$
(
"#add_user_button"
).
on
(
"click"
,
function
(
e
)
{
NativeBridgeDelegate
.
showLoadingIndicator
();
});
};
// 画像の読み込みが全て終わったタイミングでコールバック実行
// FIXME 追加読み込みの場合は差分の画像のみ監視すべきだが、現状新規入室時にしか対応出来ていない。
ChatRoom
.
waitForLoadingVideo
=
function
(
div
,
callback
)
{
...
...
public_new/js/views/chats/management/chat-add-user.js
View file @
f190b633
...
...
@@ -36,7 +36,7 @@ ChatAddUser.searchUser = function (keyword) {
}
else
{
const
userList
=
NativeBridgeDataSource
.
getMyGroupShopMemberNotInRoomByName
(
keyword
);
searchUserData
(
userList
,
overlayMessage
);
ChatAddUser
.
searchUserData
(
userList
,
overlayMessage
);
hasNoData
=
userList
.
length
==
0
;
}
// Set NoResult
...
...
@@ -352,7 +352,6 @@ ChatAddUser.appendUserInGroup = function (groupUserList) {
};
ChatAddUser
.
toggleCategory
=
function
(
category
)
{
console
.
log
(
"peacekim:: ChatAddUser.toggleCategory"
);
$
(
category
).
toggleClass
(
"open"
);
$
(
category
).
next
().
slideToggle
();
};
\ No newline at end of file
};
public_new/js/views/chats/management/chat-make-room.js
View file @
f190b633
...
...
@@ -139,6 +139,9 @@ ChatMakeRoom.renderUser = function (url, userList) {
$
(
"#makeRoomConfirmBtn"
).
on
(
"click"
,
function
(
e
)
{
const
selectedUserList
=
ChatManagementCommon
.
selectedUserList
.
join
(
","
);
if
(
selectedUserList
.
length
==
0
)
{
return
;
}
NativeBridgeDelegate
.
saveSelectedUserList
(
selectedUserList
);
$
(
"#makeRoomForm"
).
submit
();
});
...
...
public_new/js/views/contact/contact.js
View file @
f190b633
...
...
@@ -382,7 +382,6 @@ Contact.appendUsersInGroup = function (userList) {
};
Contact
.
toggleCategory
=
function
(
category
)
{
console
.
log
(
"peacekim:: Contact.toggleCategory"
);
$
(
category
).
toggleClass
(
"open"
);
$
(
category
).
next
().
slideToggle
();
};
\ No newline at end of file
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