Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2025-11-04 07:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Default normal scrollbar unless theme param set

Browse Source
This commit is contained in:
Jeremy Zhang
2018-08-08 03:57:28 +00:00
parent 5ffa7dbca7
commit 52c076e667
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/titanembeds/constants.py
View File

@@ -74,7 +74,7 @@ QUERY_PARAMETERS = [
"options": [
{
"name": "light",
"default": True,
"default": False,
},
{
"name": "dark",
@@ -185,7 +185,7 @@ QUERY_PARAMETERS = [
{
"name": "showscrollbar",
"type": "boolean",
"description": "Shows the scrollbar permanently without autohiding.",
"description": "Shows the scrollbar permanently without autohiding. (Requires the scrollbar theme param to be set)",
"example": "true",
"options": [
{

33
webapp/titanembeds/static/js/embed.js
View File

@@ -328,7 +328,11 @@
if (!has_already_been_initially_resized) {
has_already_been_initially_resized = true;
if (has_handled_noscroll) {
$("main").mCustomScrollbar("scrollTo", "bottom", {scrollEasing:"easeOut"});
if (getParameterByName("scrollbartheme")) {
$("main").mCustomScrollbar("scrollTo", "bottom", {scrollEasing:"easeOut"});
} else {
$("main").animate({ scrollTop: $("#chatcontent").height() }, "slow");
}
} else {
has_handled_noscroll = true;
Materialize.toast('Continue scrolling to read on...', 5000);
@@ -359,13 +363,12 @@
showScrollbar = 0;
}
var scrollbarTheme = getParameterByName("scrollbartheme");
if (!scrollbarTheme) {
scrollbarTheme = "light";
if (scrollbarTheme) {
$("main").mCustomScrollbar({
autoHideScrollbar: !showScrollbar,
theme: scrollbarTheme
});
}
$("main").mCustomScrollbar({
autoHideScrollbar: !showScrollbar,
theme: scrollbarTheme
});
if (disabled) {
Materialize.toast('This server is currently disabled. If you are an administrator of this server, please get in touch with a TitanEmbeds team member to lift the ban.', 100000);
@@ -1325,12 +1328,16 @@
has_handled_noscroll = true;
Materialize.toast('Continue scrolling to read on...', 5000);
} else {
if ($(window).height() < $("main .mCSB_container").height()) {
$("main .mCSB_container").animate({
top: -1 * ($("main .mCSB_container").height() - $(window).height())
}, "slow", function () {
$("main").mCustomScrollbar("update");
});
if (getParameterByName("scrollbartheme")) {
if ($(window).height() < $("main .mCSB_container").height()) {
$("main .mCSB_container").animate({
top: -1 * ($("main .mCSB_container").height() - $(window).height())
}, "slow", function () {
$("main").mCustomScrollbar("update");
});
}
} else {
$("main").animate({ scrollTop: $("#chatcontent").height() }, "slow");
}
}
}