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
2863d127
Commit
2863d127
authored
Mar 19, 2021
by
Takatoshi Miura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ペン、ポインターのON/OFF実装
parent
f63b9ee0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
94 additions
and
21 deletions
+94
-21
public/css/chat.css
+12
-1
public/index.html
+1
-1
public/js/share.js
+81
-19
No files found.
public/css/chat.css
View file @
2863d127
...
...
@@ -1025,7 +1025,7 @@ p#coview_time {
padding
:
0px
;
}
.coview_
member_area
,
.coview_
type_area
{
.coview_type_area
{
position
:
absolute
;
width
:
100%
;
height
:
calc
(
100vh
-
178px
);
...
...
@@ -1036,6 +1036,17 @@ p#coview_time {
background
:
#525252
;
}
.coview_member_area
{
position
:
absolute
;
width
:
100%
;
height
:
calc
(
100vh
-
178px
);
bottom
:
120px
;
overflow-y
:
scroll
;
text-align
:
center
;
z-index
:
3
;
background
:
#525252
;
}
.coview_add_member_area
{
width
:
70vw
;
height
:
70vh
;
...
...
public/index.html
View file @
2863d127
...
...
@@ -89,7 +89,7 @@
<img
class=
""
src=
"./icon/ic_collaboration_tool_show.png"
alt=
""
>
</button>
</div>
<div
class=
"coview_tool_area"
>
<div
class=
"coview_tool_area"
id=
"coviewToolArea"
>
<div
class=
"coview_tool_area_left"
>
<button
class=
"coview_tool_btn"
id=
"penBtn"
>
<img
class=
""
src=
"./icon/ic_collaboration_tool_pen.png"
alt=
""
>
...
...
public/js/share.js
View file @
2863d127
...
...
@@ -99,15 +99,17 @@ $(function() {
// 閉じるボタン
$
(
"#coviewShareCloseButton"
).
on
(
"click"
,
function
(
e
)
{
// ナビゲーションボタン
$
(
"#coviewChangeTypeButton"
).
show
();
$
(
"#coviewAddMemberButton"
).
show
();
$
(
"#coviewMemberButton"
).
show
();
$
(
"#coviewShareCloseButton"
).
hide
();
// 画面表示
Coview_setNavigationMenu
();
$
(
".coview_type_area"
).
hide
();
$
(
".coview_add_member_area"
).
hide
();
$
(
".coview_member_area"
).
hide
();
// 画面表示
switch
(
globalUserInfo
.
coWorkType
)
{
case
"audio"
:
$
(
".coview_member_area"
).
show
();
break
;
default
:
$
(
".coview_member_area"
).
hide
();
}
});
...
...
@@ -137,12 +139,30 @@ $(function() {
// ペン
$
(
"#penBtn"
).
on
(
"click"
,
function
(
e
)
{
FreeDrawOnOff
(
"off"
);
var
flg
=
$
(
this
).
hasClass
(
"active"
);
if
(
flg
==
true
)
{
$
(
this
).
removeClass
(
"active"
);
document
.
getElementById
(
'penBtn'
).
innerHTML
=
'<img class="" src="./icon/ic_collaboration_tool_pen.png" alt="">'
;
FreeDrawOnOff
(
"on"
);
}
else
{
$
(
this
).
addClass
(
"active"
);
document
.
getElementById
(
'penBtn'
).
innerHTML
=
'<img class="" src="./icon/ic_collaboration_tool_pen.png" alt="">'
;
FreeDrawOnOff
(
"off"
);
}
});
// ポインター
$
(
"#pointerBtn"
).
on
(
"click"
,
function
(
e
)
{
ColorDrawOnOff
(
"off"
);
var
flg
=
$
(
this
).
hasClass
(
"active"
);
if
(
flg
==
true
)
{
$
(
this
).
removeClass
(
"active"
);
document
.
getElementById
(
'pointerBtn'
).
innerHTML
=
'<img class="" src="./icon/ic_collaboration_tool_pointer.png" alt="">'
;
ColorDrawOnOff
(
"on"
);
}
else
{
$
(
this
).
addClass
(
"active"
);
document
.
getElementById
(
'pointerBtn'
).
innerHTML
=
'<img class="" src="./icon/ic_collaboration_tool_pointer.png" alt="">'
;
ColorDrawOnOff
(
"off"
);
}
});
// クリア
...
...
@@ -359,17 +379,11 @@ function Coview_shareDropdownHide() {
// 協業画面へ遷移
function
Coview_moveToVideoShareArea
()
{
$
(
"#loadingIndicator"
).
addClass
(
"full_active"
);
$
(
".coview_share_area"
).
show
();
$
(
".coview_type_area"
).
hide
();
$
(
".coview_add_member_area"
).
hide
();
$
(
".coview_member_area"
).
hide
();
$
(
".coview_share_title_name"
).
text
(
getLocalizedString
(
"talking"
));
// ナビゲーションバーの表示
$
(
"#coviewChangeTypeButton"
).
show
();
$
(
"#coviewAddMemberButton"
).
show
();
$
(
"#coviewMemberButton"
).
show
();
$
(
"#coviewShareCloseButton"
).
hide
();
// 設定
// 表示設定
Coview_setShareArea
();
Coview_setNavigationMenu
();
Coview_setControlMenu
();
Coview_setCoviewTypeBtn
();
Coview_setCoviewMember
();
// 時間計測開始
...
...
@@ -377,6 +391,54 @@ function Coview_moveToVideoShareArea() {
timerId
=
setTimeout
(
Coview_setTime
,
1000
);
}
// 協業画面の表示設定
function
Coview_setShareArea
()
{
switch
(
globalUserInfo
.
coWorkType
)
{
case
"audio"
:
$
(
".coview_share_area"
).
show
();
$
(
".coview_member_area"
).
show
();
$
(
".coview_type_area"
).
hide
();
$
(
".coview_add_member_area"
).
hide
();
break
;
default
:
$
(
".coview_share_area"
).
show
();
$
(
".coview_member_area"
).
hide
();
$
(
".coview_type_area"
).
hide
();
$
(
".coview_add_member_area"
).
hide
();
}
}
// ナビゲーションバーの表示設定
function
Coview_setNavigationMenu
()
{
switch
(
globalUserInfo
.
coWorkType
)
{
case
"audio"
:
$
(
"#coviewChangeTypeButton"
).
show
();
$
(
"#coviewAddMemberButton"
).
show
();
$
(
"#coviewMemberButton"
).
hide
();
$
(
"#coviewShareCloseButton"
).
hide
();
break
;
default
:
$
(
"#coviewChangeTypeButton"
).
show
();
$
(
"#coviewAddMemberButton"
).
show
();
$
(
"#coviewMemberButton"
).
show
();
$
(
"#coviewShareCloseButton"
).
hide
();
}
}
// コントロールメニューの表示設定
function
Coview_setControlMenu
()
{
switch
(
globalUserInfo
.
coWorkType
)
{
case
"audio"
:
$
(
'#toolAreaSwitcher'
).
hide
();
$
(
'#coviewToolArea'
).
hide
();
break
;
// TODO 他の協業
default
:
$
(
'#toolAreaSwitcher'
).
show
();
$
(
'#coviewToolArea'
).
show
();
}
}
// 協業タイプ選択画面の設定
function
Coview_setCoviewTypeBtn
()
{
// 初期化
...
...
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