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
d90c5699
Commit
d90c5699
authored
Aug 29, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bug/#44044_caturep_button_on_change_collaboration' into debug/console_logs
parents
1c81cd72
6db82ab5
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1 additions
and
229 deletions
+1
-229
public_new/collaboration_documents_overlay_menu.html
+0
-43
public_new/collaboration_picture_overlay_menu.html
+0
-56
public_new/collaboration_video_overlay_menu.html
+0
-43
public_new/collaboration_voice_overlay_menu.html
+0
-43
public_new/collaboration_whiteboard_overlay_menu.html
+0
-43
public_new/js/views/collaboration/share-event-listener.js
+1
-1
No files found.
public_new/collaboration_documents_overlay_menu.html
deleted
100644 → 0
View file @
1c81cd72
<div
id=
"overlay_menu"
class=
"overlay fixed"
>
<div
class=
"overlay_menu_wrap"
>
<div
class=
"overlay_menu h-100 d-flex justify-content-center align-items-center"
>
<div
class=
"menu_wrap"
>
<div
class=
"menu d-flex flex-row flex-wrap"
>
<div
class=
"item"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('image');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_picture.svg"
alt=
"写真共有"
>
</div>
<span>
写真共有
</span>
</a>
</div>
<div
class=
"item"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('video');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_videocam.svg"
alt=
"動画共有"
>
</div>
<span>
動画共有
</span>
</a>
</div>
<div
class=
"item"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('docs');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_document.svg"
alt=
"文書共有"
>
</div>
<span>
文書共有
</span>
</a>
</div>
<div
class=
"item"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('image');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_whiteboard.svg"
alt=
"落書き"
>
</div>
<span>
落書き
</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
public_new/collaboration_picture_overlay_menu.html
deleted
100644 → 0
View file @
1c81cd72
<div
id=
"overlay_menu"
class=
"overlay fixed"
>
<div
class=
"overlay_menu_wrap"
>
<div
class=
"overlay_menu h-100 d-flex justify-content-center align-items-center"
>
<div
class=
"menu_wrap"
>
<div
class=
"menu d-flex flex-row flex-wrap"
>
<div
class=
"item collaboration_contents picture_contents video_contents document_contents board_contents"
>
<a
href=
"javascript:changeCollaboration(COLLABORATION_TYPE.AUDIO);"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_headset.svg"
alt=
"音声共有"
>
</div>
<span>
音声共有
</span>
</a>
</div>
<div
class=
"item collaboration_contents picture_contents voice_contents document_contents board_contents"
>
<a
href=
"javascript:changeCollaboration(COLLABORATION_TYPE.VIDEO);"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_videocam.svg"
alt=
"動画共有"
>
</div>
<span>
動画共有
</span>
</a>
</div>
<div
class=
"item collaboration_contents video_contents voice_contents document_contents board_contents"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('image');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_picture.svg"
alt=
"写真共有"
>
</div>
<span>
写真共有
</span>
</a>
</div>
<div
class=
"item collaboration_contents video_contents voice_contents picture_contents board_contents"
>
<a
href=
"javascript:changeCollaboration(COLLABORATION_TYPE.DOCUMENT);"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_document.svg"
alt=
"文書共有"
>
</div>
<span>
文書共有
</span>
</a>
</div>
<div
class=
"item collaboration_contents video_contents voice_contents picture_contents document_contents"
>
<a
href=
"javascript:changeCollaboration(COLLABORATION_TYPE.BOARD);"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_whiteboard.svg"
alt=
"落書き"
>
</div>
<span>
落書き
</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
public_new/collaboration_video_overlay_menu.html
deleted
100644 → 0
View file @
1c81cd72
<div
id=
"overlay_menu"
class=
"fixed hide"
>
<div
class=
"overlay_menu_wrap"
>
<div
class=
"overlay_menu d-flex justify-content-center align-items-center"
>
<div
class=
"menu_wrap"
>
<div
class=
"menu"
>
<div
class=
"item rounded-circle shadow m-2 item01"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('audio');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_headset.svg"
alt=
"音声共有"
>
</div>
<span>
音声共有
</span>
</a>
</div>
<div
class=
"item rounded-circle shadow m-2 item02"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('image');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_picture.svg"
alt=
"写真共有"
>
</div>
<span>
写真共有
</span>
</a>
</div>
<div
class=
"item rounded-circle shadow m-2 item03"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('docs');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_document.svg"
alt=
"文書共有"
>
</div>
<span>
文書共有
</span>
</a>
</div>
<div
class=
"item rounded-circle shadow m-2 item04"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('image');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_whiteboard.svg"
alt=
"落書き"
>
</div>
<span>
落書き
</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
public_new/collaboration_voice_overlay_menu.html
deleted
100644 → 0
View file @
1c81cd72
<div
id=
"overlay_menu"
class=
"fixed hide"
>
<div
class=
"overlay_menu_wrap"
>
<div
class=
"overlay_menu d-flex justify-content-center align-items-center"
>
<div
class=
"menu_wrap"
>
<div
class=
"menu"
>
<div
class=
"item rounded-circle shadow m-2 item01"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('image');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_picture.svg"
alt=
"写真共有"
>
</div>
<span>
写真共有
</span>
</a>
</div>
<div
class=
"item rounded-circle shadow m-2 item02"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('video');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_videocam.svg"
alt=
"動画共有"
>
</div>
<span>
動画共有
</span>
</a>
</div>
<div
class=
"item rounded-circle shadow m-2 item03"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('docs');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_document.svg"
alt=
"文書共有"
>
</div>
<span>
文書共有
</span>
</a>
</div>
<div
class=
"item rounded-circle shadow m-2 item04"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('image');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_whiteboard.svg"
alt=
"落書き"
>
</div>
<span>
落書き
</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
public_new/collaboration_whiteboard_overlay_menu.html
deleted
100644 → 0
View file @
1c81cd72
<div
id=
"overlay_menu"
class=
"overlay fixed"
>
<div
class=
"overlay_menu_wrap"
>
<div
class=
"overlay_menu h-100 d-flex justify-content-center align-items-center"
>
<div
class=
"menu_wrap"
>
<div
class=
"menu d-flex flex-row flex-wrap"
>
<div
class=
"item"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('audio');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_headset.svg"
alt=
"音声共有"
>
</div>
<span>
音声共有
</span>
</a>
</div>
<div
class=
"item"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('video');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_videocam.svg"
alt=
"動画共有"
>
</div>
<span>
動画共有
</span>
</a>
</div>
<div
class=
"item"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('image');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_picture.svg"
alt=
"写真共有"
>
</div>
<span>
写真共有
</span>
</a>
</div>
<div
class=
"item"
>
<a
href=
"javascript:coview_api.ChangeCollaboration('docs');"
class=
"d-flex flex-column align-items-center"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_collabo_document.svg"
alt=
"文書共有"
>
</div>
<span>
文書共有
</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
public_new/js/views/collaboration/share-event-listener.js
View file @
d90c5699
...
...
@@ -332,7 +332,7 @@ CollaborationFeature.updateHost = function () {
CollaborationUI
.
showHostMark
(
g_isMainManUsername
);
$
(
"
#remoteVideoNameSpan"
).
addClass
(
"hid
e"
);
$
(
"
.remoteVideoNameSpan"
).
addClass
(
"non
e"
);
};
CollaborationUI
.
showHostButtons
=
function
()
{
...
...
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