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
8474f026
Commit
8474f026
authored
Apr 26, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release_sp3' of gitlab.agentec.jp:abookCommunication/chat_webview into release_sp3
parents
69506ea0
134248d8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
public_new/js/chat-ui.js
+8
-0
public_new/js/share.js
+0
-0
public_new/modal_collabo_profile.html
+4
-4
No files found.
public_new/js/chat-ui.js
View file @
8474f026
...
@@ -1350,6 +1350,14 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
...
@@ -1350,6 +1350,14 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
// メッセージの画面描画
// メッセージの画面描画
jQueryMessages
.
prepend
(
workVal
);
jQueryMessages
.
prepend
(
workVal
);
// iOSは協業ボタンを非活性化
if
(
CHAT_UTIL
.
isIOS
())
{
$
(
'.footer_content_b a'
).
css
(
'pointer-events'
,
'none'
);
$
(
'.footer_content_b .footer_item'
).
on
(
'click'
,
function
()
{
alert
(
'選択した機能は現在ご利用になれません。'
);
});
}
CHAT_UI
.
waitForLoadingImage
(
jQueryMessages
,
CHAT_UI
.
scrollToBottom
);
CHAT_UI
.
waitForLoadingImage
(
jQueryMessages
,
CHAT_UI
.
scrollToBottom
);
CHAT_UI
.
waitForLoadingVideo
(
jQueryMessages
,
CHAT_UI
.
scrollToBottom
);
CHAT_UI
.
waitForLoadingVideo
(
jQueryMessages
,
CHAT_UI
.
scrollToBottom
);
// ユーザ削除ボタン表示しない
// ユーザ削除ボタン表示しない
...
...
public_new/js/share.js
View file @
8474f026
This diff is collapsed.
Click to expand it.
public_new/modal_collabo_profile.html
View file @
8474f026
...
@@ -3,13 +3,13 @@
...
@@ -3,13 +3,13 @@
<div
class=
"modal-dialog modal-dialog-centered"
role=
"document"
>
<div
class=
"modal-dialog modal-dialog-centered"
role=
"document"
>
<div
class=
"modal-content"
>
<div
class=
"modal-content"
>
<div
class=
"modal-header border-0"
>
<div
class=
"modal-header border-0"
>
<div
class=
"profile_desc d-flex flex-row"
>
<img
src=
"{{profileUrl}}"
onError=
"this.src='./img/noImage.png'"
/>
<div
class=
"profile_name"
><span>
{{name}}
</span></div>
</div>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-label=
"Close"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
aria-label=
"Close"
>
<span
aria-hidden=
"true"
>
×
</span>
<span
aria-hidden=
"true"
>
×
</span>
</button>
</button>
<div
class=
"profile_desc_ d-flex flex-row"
>
<img
src=
"{{profileUrl}}"
onError=
"this.src='./img/noImage.png'"
/>
<div
class=
"profile_name"
><span>
{{name}}
</span></div>
</div>
</div>
</div>
<div
class=
"modal-body"
>
<div
class=
"modal-body"
>
{{#groupPathList}}
{{#groupPathList}}
...
...
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