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
03210a55
Commit
03210a55
authored
Apr 02, 2021
by
Lee Daehyun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contact グループ画面からの全社の場合トップボタンと上位ボタンの修正
parent
2e455b85
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
5 deletions
+17
-5
public_new/contact.html
+2
-2
public_new/js/chat-ui.js
+15
-3
No files found.
public_new/contact.html
View file @
03210a55
...
@@ -92,7 +92,7 @@
...
@@ -92,7 +92,7 @@
<div
class=
"chat_list"
>
<div
class=
"chat_list"
>
<!-- 全グループ -->
<!-- 全グループ -->
<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"
id=
"rootGroupArea"
>
<a
href=
"#"
class=
"w-100"
id=
"rootGroupBtn"
>
<a
href=
"#"
class=
"w-100"
id=
"rootGroupBtn"
>
<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"
>
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
</div>
</div>
</a>
</a>
</li>
</li>
<li
class=
"d-flex align-items-center"
>
<li
class=
"d-flex align-items-center"
id=
"parentGroupArea"
>
<a
href=
"#"
class=
"w-100"
id=
"parentGroupBtn"
>
<a
href=
"#"
class=
"w-100"
id=
"parentGroupBtn"
>
<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"
>
...
...
public_new/js/chat-ui.js
View file @
03210a55
...
@@ -1309,7 +1309,8 @@ CHAT_UI.insertFavoriteGroup = function(groupId) {
...
@@ -1309,7 +1309,8 @@ CHAT_UI.insertFavoriteGroup = function(groupId) {
};
};
//全グループ検索画面表示。
//全グループ検索画面表示。
CHAT_UI
.
refreshAllGroupSearch
=
function
(
groupId
)
{
CHAT_UI
.
refreshAllGroupSearch
=
function
(
paramGroupId
)
{
var
groupId
=
paramGroupId
;
CHAT_UI
.
showLoadingIndicator
();
CHAT_UI
.
showLoadingIndicator
();
$
(
'#userNameCard'
).
modal
(
'hide'
);
$
(
'#userNameCard'
).
modal
(
'hide'
);
$
(
'.cancel'
).
addClass
(
'none'
);
$
(
'.cancel'
).
addClass
(
'none'
);
...
@@ -1320,7 +1321,6 @@ CHAT_UI.refreshAllGroupSearch = function(groupId) {
...
@@ -1320,7 +1321,6 @@ CHAT_UI.refreshAllGroupSearch = function(groupId) {
$
(
'.overlay_src_msg'
).
empty
();
$
(
'.overlay_src_msg'
).
empty
();
$
(
'#tabAllGroup'
).
prop
(
'checked'
,
true
);
$
(
'#tabAllGroup'
).
prop
(
'checked'
,
true
);
//オンライン状態であればサーバから情報更新。
//オンライン状態であればサーバから情報更新。
if
(
IS_ONLINE
==
'true'
)
{
if
(
IS_ONLINE
==
'true'
)
{
android
.
updateGroupInfo
(
groupId
);
android
.
updateGroupInfo
(
groupId
);
...
@@ -1343,11 +1343,18 @@ CHAT_UI.refreshAllGroupSearch = function(groupId) {
...
@@ -1343,11 +1343,18 @@ CHAT_UI.refreshAllGroupSearch = function(groupId) {
});
});
}
}
if
(
typeof
result
.
rootGroupId
!==
'undefined'
)
{
if
(
typeof
result
.
rootGroupId
!==
'undefined'
)
{
if
(
paramGroupId
==
0
)
{
groupId
=
result
.
rootGroupId
}
$
(
'#rootGroupBtn'
).
on
(
'click'
,
function
()
{
$
(
'#rootGroupBtn'
).
on
(
'click'
,
function
()
{
CHAT_UI
.
refreshAllGroupSearch
(
result
.
rootGroupId
);
CHAT_UI
.
refreshAllGroupSearch
(
result
.
rootGroupId
);
});
});
}
}
if
(
groupId
==
result
.
rootGroupId
||
paramGroupId
==
'0'
)
{
$
(
'#rootGroupArea'
).
addClass
(
'none'
);
$
(
'#parentGroupArea'
).
addClass
(
'none'
);
}
else
{
$
(
'#rootGroupArea'
).
removeClass
(
'none'
);
$
(
'#parentGroupArea'
).
removeClass
(
'none'
);
}
//該当グループのパースを表示。
//該当グループのパースを表示。
var
groupPathTemplate
;
var
groupPathTemplate
;
$
.
get
({
url
:
"./template/template_group_path.html"
,
async
:
false
}
$
.
get
({
url
:
"./template/template_group_path.html"
,
async
:
false
}
...
@@ -1942,4 +1949,8 @@ CHAT_UI.showMakeRoomConfirmView = function() {
...
@@ -1942,4 +1949,8 @@ CHAT_UI.showMakeRoomConfirmView = function() {
}
}
});
});
//上位グループ、トップグループ遷移ボタンのイベント追加。
if
(
typeof
result
.
parentGroupId
===
'undefined'
)
{
$
(
'.colporate_none'
).
addClass
(
'none'
);
}
}
}
\ 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