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
750300a0
Commit
750300a0
authored
Apr 02, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
バグ修正。
parent
ce69af2e
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
9 deletions
+33
-9
public_new/chat_make_room.html
+3
-3
public_new/js/chat-ui.js
+23
-6
public_new/js/common.js
+2
-0
public_new/js/constant.js
+4
-0
public_new/modal_chat_menu.html
+1
-0
No files found.
public_new/chat_make_room.html
View file @
750300a0
...
...
@@ -51,9 +51,9 @@
<!-- タブ -->
<div
class=
"content tabs"
>
<input
id=
"tabMyGroupOnMakeRoom"
type=
"radio"
name=
"tab_item"
checked
>
<input
id=
"tabMyGroupOnMakeRoom"
type=
"radio"
name=
"tab_item"
>
<label
class=
"tab_item"
for=
"tabMyGroupOnMakeRoom"
>
マイグループ
</label>
<input
id=
"tabAllGroupOnMakeRoom"
type=
"radio"
name=
"tab_item"
>
<input
id=
"tabAllGroupOnMakeRoom"
type=
"radio"
name=
"tab_item"
checked
>
<label
class=
"tab_item"
for=
"tabAllGroupOnMakeRoom"
>
全グループ
</label>
<div
class=
"tab_content"
id=
"tab1_content"
>
<div
class=
"chat_list"
>
...
...
@@ -174,7 +174,7 @@
}
else
{
$
(
'.select_member_num'
).
text
(
'0'
);
}
CHAT_UI
.
refresh
MyGroupForMakeRoom
(
);
CHAT_UI
.
refresh
AllGroupForMakeRoom
(
groupSearchFlg
.
ALL
);
};
</script>
</body>
...
...
public_new/js/chat-ui.js
View file @
750300a0
...
...
@@ -1238,6 +1238,7 @@ $('#tabGroup').on('click', function(e) {
CHAT_UI
.
refreshRoomList
(
chatRoomType
.
GROUP
);
});
$
(
'#tabAllGroup'
).
on
(
'click'
,
function
(
e
)
{
CHAT_UI
.
refreshAllGroupSearch
(
'0'
);
});
...
...
@@ -1264,6 +1265,10 @@ $('#addUserConfirmBtn').on('click', function(e) {
$
(
'#addUserForm'
).
submit
();
});
CHAT_UI
.
roomDisplayOff
=
function
()
{
android
.
roomDisplayOff
();
}
CHAT_UI
.
favoriteUserChange
=
function
(
shopMemberId
,
star
)
{
if
(
$
(
star
).
hasClass
(
'active'
))
{
CHAT_UI
.
removeFavoriteUser
(
shopMemberId
);
...
...
@@ -1291,17 +1296,22 @@ CHAT_UI.removeFavoriteUser = function(shopMemberId) {
};
CHAT_UI
.
insertFavoriteUser
=
function
(
shopMemberId
)
{
CHAT_UI
.
showLoadingIndicator
();
$
(
'#userNameCard'
).
modal
(
'hide'
);
$
(
'#myNameCard'
).
modal
(
'hide'
);
android
.
addFavoriteUser
(
shopMemberId
);
$
(
'.shopmember_'
+
shopMemberId
).
removeClass
(
'disable'
);
$
(
'.shopmember_'
+
shopMemberId
).
addClass
(
'active'
);
var
result
=
android
.
addFavoriteUser
(
shopMemberId
);
if
(
!
result
)
{
$
(
'.shopmember_'
+
groupId
).
addClass
(
'disable'
);
$
(
'.shopmember_'
+
groupId
).
removeClass
(
'active'
);
CHAT_UI
.
dismissLoadingIndicator
();
return
;
}
else
{
$
(
'.shopmember_'
+
groupId
).
removeClass
(
'disable'
);
$
(
'.shopmember_'
+
groupId
).
addClass
(
'active'
);
}
CHAT_UI
.
dismissLoadingIndicator
();
};
CHAT_UI
.
removeFavoriteGroup
=
function
(
groupId
)
{
CHAT_UI
.
showLoadingIndicator
();
android
.
removeFavoriteGroup
(
groupId
);
$
(
'.group_'
+
groupId
).
removeClass
(
'active'
);
$
(
'.group_'
+
groupId
).
addClass
(
'disable'
);
...
...
@@ -1310,9 +1320,16 @@ CHAT_UI.removeFavoriteGroup = function(groupId) {
CHAT_UI
.
insertFavoriteGroup
=
function
(
groupId
)
{
CHAT_UI
.
showLoadingIndicator
();
android
.
addFavoriteGroup
(
groupId
);
var
result
=
android
.
addFavoriteGroup
(
groupId
);
if
(
!
result
)
{
$
(
'.group_'
+
groupId
).
addClass
(
'disable'
);
$
(
'.group_'
+
groupId
).
removeClass
(
'active'
);
CHAT_UI
.
dismissLoadingIndicator
();
return
;
}
else
{
$
(
'.group_'
+
groupId
).
removeClass
(
'disable'
);
$
(
'.group_'
+
groupId
).
addClass
(
'active'
);
}
CHAT_UI
.
dismissLoadingIndicator
();
};
...
...
public_new/js/common.js
View file @
750300a0
...
...
@@ -53,6 +53,7 @@ $(function() {
$
(
'.message_input_form'
).
click
(
function
(){
$
(
'.message_input_send'
).
removeClass
(
'none'
);
$
(
'.attach_file'
).
addClass
(
'none'
);
$
(
'.footer_content_b'
).
addClass
(
'none'
);
});
$
(
'.message_input_form'
).
on
(
'focusout'
,
function
(
e
){
...
...
@@ -61,6 +62,7 @@ $(function() {
}
$
(
'.message_input_send'
).
addClass
(
'none'
);
$
(
'.attach_file'
).
removeClass
(
'none'
);
$
(
'.footer_content_b'
).
removeClass
(
'none'
);
});
});
public_new/js/constant.js
View file @
750300a0
...
...
@@ -27,6 +27,10 @@ const chatRoomType = {
ALL
:
"2"
}
const
groupSearchFlg
=
{
ROOT
:
"0"
}
const
nameCardAreaId
=
{
MY
:
"myNamecard"
,
USER
:
"userNamecard"
...
...
public_new/modal_chat_menu.html
View file @
750300a0
...
...
@@ -11,6 +11,7 @@
<ul>
<li><a
href=
"chat_change_room_name.html"
><img
src=
"icon/icon_change_room_name.png"
alt=
"ルーム名変更"
>
ルーム名変更
</a></li>
<li><a
href=
"chat_add_user.html"
><img
src=
"icon/icon_add_user.png"
alt=
"ユーザー招待"
>
ユーザー招待
</a></li>
<li
><a
href=
"javascript:return false;"
onclick=
"CHAT_UI.roomDisplayOff();"
><img
src=
"icon/icon_chat_gray.png"
alt=
"ユーザー招待"
>
部屋非表示
</a></li>
</ul>
</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