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
8d4e6970
Commit
8d4e6970
authored
Aug 03, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed disable the scroll
parent
ec77a4ea
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
14 deletions
+24
-14
public_new/css/collaboration.css
+4
-0
public_new/js/views/collaboration/collaboration-add-user.js
+1
-1
public_new/js/views/collaboration/collaboration.js
+19
-13
No files found.
public_new/css/collaboration.css
View file @
8d4e6970
...
@@ -486,6 +486,10 @@
...
@@ -486,6 +486,10 @@
margin
:
auto
0
;
margin
:
auto
0
;
}
}
.coview_on_media_image_crown
{
visibility
:
hidden
;
}
/**************************** modal *************************/
/**************************** modal *************************/
#captyaModal
.modal-header
span
,
#captyaModal
.modal-header
span
,
#changeHostModal
.modal-header
span
,
#changeHostModal
.modal-header
span
,
...
...
public_new/js/views/collaboration/collaboration-add-user.js
View file @
8d4e6970
CollaborationUI
.
initialBindAddUserButton
=
function
()
{
CollaborationUI
.
initialBindAddUserButton
=
function
()
{
// ユーザー招待メンバー検索
// ユーザー招待メンバー検索
$
(
".add_user_btn"
).
click
(
function
()
{
$
(
".add_user_btn"
).
click
(
function
()
{
CollaborationUI
.
bindE
nableScroll
();
CollaborationUI
.
e
nableScroll
();
Common
.
showLoadingIndicator
();
Common
.
showLoadingIndicator
();
ChatManagementCommon
.
selectedUserList
=
[];
ChatManagementCommon
.
selectedUserList
=
[];
CollaborationUI
.
refreshMyGroupForAddUserInCollaboration
();
CollaborationUI
.
refreshMyGroupForAddUserInCollaboration
();
...
...
public_new/js/views/collaboration/collaboration.js
View file @
8d4e6970
var
CollaborationUI
=
{};
var
CollaborationUI
=
{};
document
.
addEventListener
(
"DOMContentLoaded"
,
function
()
{
document
.
addEventListener
(
"DOMContentLoaded"
,
function
()
{
CollaborationUI
.
bindD
isableScroll
();
CollaborationUI
.
d
isableScroll
();
// メニューオーバーレイ表示
// メニューオーバーレイ表示
CollaborationUI
.
bindMenuButton
();
CollaborationUI
.
bindMenuButton
();
...
@@ -36,30 +36,36 @@ CollaborationUI.bindMenuButton = function () {
...
@@ -36,30 +36,36 @@ CollaborationUI.bindMenuButton = function () {
CollaborationUI
.
bindDisplayUsersButton
=
function
()
{
CollaborationUI
.
bindDisplayUsersButton
=
function
()
{
$
(
".user_btn"
).
click
(
function
()
{
$
(
".user_btn"
).
click
(
function
()
{
var
w
=
$
(
this
).
width
();
const
width
=
$
(
this
).
width
();
$
(
"#overlay_user_list.overlay"
).
stop
();
$
(
this
).
toggleClass
(
"hide"
);
$
(
this
).
toggleClass
(
"hide"
);
$
(
"#overlay_user_list.overlay"
)
$
(
"#overlay_user_list.overlay"
)
.
toggleClass
(
"slidein"
)
.
toggleClass
(
"slidein"
)
.
css
({
transform
:
"translateX("
&
-
w
&
")"
});
.
animate
({
left
:
"+=width"
},
500
,
function
()
{
scrollTo
(
0
,
0
);
});
if
(
$
(
this
).
hasClass
(
"hide"
))
{
if
(
$
(
this
).
hasClass
(
"hide"
))
{
CollaborationUI
.
bindE
nableScroll
();
CollaborationUI
.
e
nableScroll
();
}
else
{
}
else
{
scrollTo
(
0
,
0
);
CollaborationUI
.
disableScroll
();
CollaborationUI
.
bindDisableScroll
();
}
}
});
});
};
};
function
aa
()
{
$
(
"#overlay_user_list.overlay"
).
on
(
"slide.bs.carousel"
,
function
()
{
console
.
log
(
"peacekim:: #overlay_user_list.overlay moved"
);
});
}
CollaborationUI
.
userListSlideOut
=
function
()
{
CollaborationUI
.
userListSlideOut
=
function
()
{
const
w
=
$
(
".user_btn"
).
width
();
const
userButtonWidth
=
$
(
".user_btn"
).
width
();
$
(
".user_btn"
).
removeClass
(
"hide"
);
$
(
".user_btn"
).
removeClass
(
"hide"
);
$
(
"#overlay_user_list.overlay"
)
$
(
"#overlay_user_list.overlay"
)
.
removeClass
(
"slidein"
)
.
removeClass
(
"slidein"
)
.
css
({
transform
:
"translateX("
&
-
w
&
")"
});
.
css
({
transform
:
"translateX("
&
-
userButtonWidth
&
")"
});
scrollTo
(
0
,
0
);
scrollTo
(
0
,
0
);
CollaborationUI
.
bindD
isableScroll
();
CollaborationUI
.
d
isableScroll
();
};
};
CollaborationUI
.
bindChangeHostButton
=
function
()
{
CollaborationUI
.
bindChangeHostButton
=
function
()
{
...
@@ -76,7 +82,7 @@ CollaborationUI.bindChangeHostButton = function () {
...
@@ -76,7 +82,7 @@ CollaborationUI.bindChangeHostButton = function () {
CollaborationUI
.
bindCloseButton
=
function
()
{
CollaborationUI
.
bindCloseButton
=
function
()
{
$
(
".close_btn"
).
click
(
function
()
{
$
(
".close_btn"
).
click
(
function
()
{
scrollTo
(
0
,
0
);
scrollTo
(
0
,
0
);
CollaborationUI
.
bindD
isableScroll
();
CollaborationUI
.
d
isableScroll
();
});
});
};
};
...
@@ -89,7 +95,7 @@ CollaborationUI.bindInviteButton = function () {
...
@@ -89,7 +95,7 @@ CollaborationUI.bindInviteButton = function () {
/*********************************
/*********************************
* Scroll Controls
* Scroll Controls
********************************/
********************************/
CollaborationUI
.
bindD
isableScroll
=
function
()
{
CollaborationUI
.
d
isableScroll
=
function
()
{
document
.
addEventListener
(
"mousewheel"
,
CollaborationUI
.
scrollControl
,
{
document
.
addEventListener
(
"mousewheel"
,
CollaborationUI
.
scrollControl
,
{
passive
:
false
,
passive
:
false
,
});
});
...
@@ -99,7 +105,7 @@ CollaborationUI.bindDisableScroll = function () {
...
@@ -99,7 +105,7 @@ CollaborationUI.bindDisableScroll = function () {
};
};
// スクロール禁止解除
// スクロール禁止解除
CollaborationUI
.
bindE
nableScroll
=
function
()
{
CollaborationUI
.
e
nableScroll
=
function
()
{
document
.
removeEventListener
(
"mousewheel"
,
CollaborationUI
.
scrollControl
,
{
document
.
removeEventListener
(
"mousewheel"
,
CollaborationUI
.
scrollControl
,
{
passive
:
false
,
passive
:
false
,
});
});
...
...
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