StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/add-frontend-server-configuration

Browse source
This commit is contained in:
Dane Everitt 2017-10-18 22:37:23 -05:00
commit f98eb5904c
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
6 changed files with 71 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
public/themes/pterodactyl/css/terminal.css
View file

@ -61,6 +61,7 @@
opacity: .5;
font-size: 16px;
cursor: pointer;
z-index: 10;
}
.terminal-notify:hover {

20
public/themes/pterodactyl/js/frontend/console.js
View file

@ -116,13 +116,15 @@ $(document).ready(function () {
});
$terminal.on('scroll', function () {
if ($(this).scrollTop() + $(this).innerHeight() + 50 < $(this)[0].scrollHeight) {
$scrollNotify.removeClass('hidden');
} else {
if (isTerminalScrolledDown()) {
$scrollNotify.addClass('hidden');
}
});
function isTerminalScrolledDown() {
return $terminal.scrollTop() + $terminal.innerHeight() + 50 > $terminal[0].scrollHeight;
}
window.scrollToBottom = function () {
$terminal.scrollTop($terminal[0].scrollHeight);
};
@ -148,16 +150,20 @@ function pushToTerminal(string) {
}
if (TerminalQueue.length > 0) {
var scrolledDown = isTerminalScrolledDown();
for (var i = 0; i < CONSOLE_PUSH_COUNT && TerminalQueue.length > 0; i++) {
pushToTerminal(TerminalQueue[0]);
if (! $scrollNotify.is(':visible')) {
window.scrollToBottom();
}
window.ConsoleElements++;
TerminalQueue.shift();
}
if (scrolledDown) {
window.scrollToBottom();
} else if ($scrollNotify.hasClass('hidden')) {
$scrollNotify.removeClass('hidden');
}
var removeElements = window.ConsoleElements - CONSOLE_OUTPUT_LIMIT;
if (removeElements > 0) {