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
3b660c5f
Commit
3b660c5f
authored
Apr 17, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'features/#574_全グループでお気に入りを登録すると自身情報セールが表示される' into 'release_sp3'
自身情報セールの位置修正 See merge request
!64
parents
41fff884
57cf03d4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
public_new/contact.html
+3
-4
public_new/js/chat-ui.js
+0
-2
No files found.
public_new/contact.html
View file @
3b660c5f
...
@@ -56,11 +56,13 @@
...
@@ -56,11 +56,13 @@
<input
id=
"tabAllGroup"
type=
"radio"
name=
"tab_item"
>
<input
id=
"tabAllGroup"
type=
"radio"
name=
"tab_item"
>
<label
class=
"tab_item"
for=
"tabAllGroup"
>
全グループ
</label>
<label
class=
"tab_item"
for=
"tabAllGroup"
>
全グループ
</label>
<!-- タブ -->
<div
class=
"tab_content"
id=
"tab1_content"
>
<div
class=
"content chat_list my_info_sell"
>
<div
class=
"content chat_list my_info_sell"
>
<ul
class=
"p-0 chat_make_room_list"
>
<ul
class=
"p-0 chat_make_room_list"
>
<li
class=
"d-flex align-items-center"
>
<li
class=
"d-flex align-items-center"
>
<a
href=
"#"
style=
"width: 100%;"
>
<a
href=
"#"
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"
style=
"background: none !important;
"
>
<div
class=
"chat_item_l"
>
<div
class=
"chat_item_l"
>
<div
class=
"thumbnail"
>
<div
class=
"thumbnail"
>
<div
class=
"img_wrap"
><img
id=
"myImg"
src=
"img/noImage.png"
onError=
"this.src='./img/noImage.png'"
/></div>
<div
class=
"img_wrap"
><img
id=
"myImg"
src=
"img/noImage.png"
onError=
"this.src='./img/noImage.png'"
/></div>
...
@@ -78,9 +80,6 @@
...
@@ -78,9 +80,6 @@
</li>
</li>
</ul>
</ul>
</div>
</div>
<!-- タブ -->
<div
class=
"tab_content"
id=
"tab1_content"
>
<div
class=
"chat_list"
id=
"myContactList"
>
<div
class=
"chat_list"
id=
"myContactList"
>
<!-- お気に入りグループ -->
<!-- お気に入りグループ -->
<div
class=
"category"
><div
class=
"category_name"
><span>
お気に入り
</span></div></div>
<div
class=
"category"
><div
class=
"category_name"
><span>
お気に入り
</span></div></div>
...
...
public_new/js/chat-ui.js
View file @
3b660c5f
...
@@ -912,7 +912,6 @@ CHAT_UI.refreshContactScreen = function() {
...
@@ -912,7 +912,6 @@ CHAT_UI.refreshContactScreen = function() {
$
(
'#userNameCard'
).
modal
(
'hide'
);
$
(
'#userNameCard'
).
modal
(
'hide'
);
$
(
'#favoriteList'
).
html
(
''
);
$
(
'#favoriteList'
).
html
(
''
);
$
(
'#myGroupList'
).
html
(
''
);
$
(
'#myGroupList'
).
html
(
''
);
$
(
'.my_info_sell'
).
css
(
'display'
,
'block'
);
//画面タイトル設定
//画面タイトル設定
let
contactListTitle
=
getLocalizedString
(
"contactListTitle"
);
let
contactListTitle
=
getLocalizedString
(
"contactListTitle"
);
$
(
'#title'
).
text
(
contactListTitle
);
$
(
'#title'
).
text
(
contactListTitle
);
...
@@ -1460,7 +1459,6 @@ CHAT_UI.refreshAllGroupSearch = function(paramGroupId) {
...
@@ -1460,7 +1459,6 @@ CHAT_UI.refreshAllGroupSearch = function(paramGroupId) {
$
(
'.overlay_src_msg'
).
empty
();
$
(
'.overlay_src_msg'
).
empty
();
$
(
'#contactSearch'
).
attr
(
'placeholder'
,
getLocalizedString
(
'searchUserAndGroup'
));
$
(
'#contactSearch'
).
attr
(
'placeholder'
,
getLocalizedString
(
'searchUserAndGroup'
));
$
(
'#tabAllGroup'
).
prop
(
'checked'
,
true
);
$
(
'#tabAllGroup'
).
prop
(
'checked'
,
true
);
$
(
'.my_info_sell'
).
css
(
'display'
,
'none'
);
//オンライン状態であればサーバから情報更新。
//オンライン状態であればサーバから情報更新。
if
(
IS_ONLINE
==
'true'
)
{
if
(
IS_ONLINE
==
'true'
)
{
...
...
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