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
ca5452d0
Commit
ca5452d0
authored
Aug 06, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugfix/#43905_arcoodians' into 'develop'
Fixed to handle arcoodian tapped event See merge request
!225
parents
f598d8fc
1b9da91b
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
6 deletions
+24
-6
public_new/js/views/chats/management/chat-add-user.js
+7
-0
public_new/js/views/contact/contact.js
+7
-0
public_new/template/template_add_user_group_user_list.html
+1
-1
public_new/template/template_group_user_list.html
+9
-5
No files found.
public_new/js/views/chats/management/chat-add-user.js
View file @
ca5452d0
...
@@ -350,3 +350,9 @@ ChatAddUser.appendUserInGroup = function (groupUserList) {
...
@@ -350,3 +350,9 @@ ChatAddUser.appendUserInGroup = function (groupUserList) {
let
obj
=
jQuery
.
parseHTML
(
html
);
let
obj
=
jQuery
.
parseHTML
(
html
);
$
(
"#userInGroupListForAddUser"
).
append
(
obj
);
$
(
"#userInGroupListForAddUser"
).
append
(
obj
);
};
};
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/contact/contact.js
View file @
ca5452d0
...
@@ -380,3 +380,9 @@ Contact.appendUsersInGroup = function (userList) {
...
@@ -380,3 +380,9 @@ Contact.appendUsersInGroup = function (userList) {
const
obj
=
jQuery
.
parseHTML
(
html
);
const
obj
=
jQuery
.
parseHTML
(
html
);
$
(
"#userInGroupList"
).
append
(
obj
);
$
(
"#userInGroupList"
).
append
(
obj
);
};
};
Contact
.
toggleCategory
=
function
(
category
)
{
console
.
log
(
"peacekim:: Contact.toggleCategory"
);
$
(
category
).
toggleClass
(
"open"
);
$
(
category
).
next
().
slideToggle
();
};
\ No newline at end of file
public_new/template/template_add_user_group_user_list.html
View file @
ca5452d0
<div
class=
"category"
onclick=
"C
ollaborationUI
.toggleCategory(this);"
>
<div
class=
"category"
onclick=
"C
hatAddUser
.toggleCategory(this);"
>
<div
class=
"category_name"
><span>
{{groupName}}
</span></div>
<div
class=
"category_name"
><span>
{{groupName}}
</span></div>
</div>
</div>
<ul
class=
"p-0 chat_make_room_list"
>
<ul
class=
"p-0 chat_make_room_list"
>
...
...
public_new/template/template_group_user_list.html
View file @
ca5452d0
<div
class=
"category"
onclick=
"CollaborationUI.toggleCategory(this);"
><div
class=
"category_name"
><span>
{{groupName}}
</span></div></div>
<div
class=
"category"
onclick=
"Contact.toggleCategory(this);"
>
<div
class=
"category_name"
><span>
{{groupName}}
</span></div>
</div>
<ul
class=
"p-0 chat_make_room_list"
>
<ul
class=
"p-0 chat_make_room_list"
>
{{#groupUserList}}
{{#groupUserList}}
<li
class=
"d-flex align-items-center"
>
<li
class=
"d-flex align-items-center"
>
<a
href=
"#"
onclick=
"Namecard.makeNameCard({{shopMemberId}})"
style=
"width: 100%;"
>
<a
href=
"#"
onclick=
"Namecard.makeNameCard({{shopMemberId}})"
style=
"width: 100%;"
>
<div
class=
"chat_item d-flex flex-row align-items-center"
>
<div
class=
"chat_item d-flex flex-row align-items-center"
>
<div
class=
"chat_item_l"
>
<div
class=
"chat_item_l"
>
<div
class=
"thumbnail"
>
<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>
</div>
<div
class=
"chat_item_m px-0"
>
<div
class=
"chat_item_m px-0"
>
...
@@ -21,10 +23,12 @@
...
@@ -21,10 +23,12 @@
<div
class=
"chat_item_r"
>
<div
class=
"chat_item_r"
>
<div
class=
"d-flex flex-column"
>
<div
class=
"d-flex flex-column"
>
{{#isFavorite}}
{{#isFavorite}}
<span
class=
"star active shopmember_{{shopMemberId}}"
onclick=
"Namecard.favoriteUserChange({{shopMemberId}}, this)"
></span>
<span
class=
"star active shopmember_{{shopMemberId}}"
onclick=
"Namecard.favoriteUserChange({{shopMemberId}}, this)"
></span>
{{/isFavorite}}
{{/isFavorite}}
{{^isFavorite}}
{{^isFavorite}}
<span
class=
"star disable shopmember_{{shopMemberId}}"
onclick=
"Namecard.favoriteUserChange({{shopMemberId}}, this)"
></span>
<span
class=
"star disable shopmember_{{shopMemberId}}"
onclick=
"Namecard.favoriteUserChange({{shopMemberId}}, this)"
></span>
{{/isFavorite}}
{{/isFavorite}}
</div>
</div>
</div>
</div>
...
...
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