diff --git a/public/themes/pterodactyl/css/pterodactyl.css b/public/themes/pterodactyl/css/pterodactyl.css index df3c800b7..4d1e94bf0 100644 --- a/public/themes/pterodactyl/css/pterodactyl.css +++ b/public/themes/pterodactyl/css/pterodactyl.css @@ -75,7 +75,7 @@ code { } .hasFileHover * { - pointer-events: none; + pointer-events: none !important; } td.has-progress { @@ -103,3 +103,13 @@ td.has-progress { .use-pointer { cursor: pointer !important; } + +.input-loader { + display: none; + position:relative; + top: -23px; + float: right; + right: 5px; + color: #cccccc; + height: 0; +} diff --git a/public/themes/pterodactyl/js/frontend/files/src/contextmenu.js b/public/themes/pterodactyl/js/frontend/files/src/contextmenu.js index f61b7bb28..dd6c37f56 100644 --- a/public/themes/pterodactyl/js/frontend/files/src/contextmenu.js +++ b/public/themes/pterodactyl/js/frontend/files/src/contextmenu.js @@ -83,7 +83,7 @@ class ContextMenuClass { } rightClick() { - $('[data-action="toggleMenu"]').on('mousedown', () => { + $('[data-action="toggleMenu"]').on('mousedown', event => { event.preventDefault(); this.showMenu(event); }); @@ -173,8 +173,12 @@ class ContextMenuClass { }); } - $(window).on('click', () => { - $(menu).remove(); + $(window).unbind().on('click', event => { + if($(event.target).is('.disable-menu-hide')) { + event.preventDefault(); + return; + } + $(menu).unbind().remove(); if(!_.isNull(this.activeLine)) this.activeLine.removeClass('active'); }); } diff --git a/resources/themes/pterodactyl/server/files/list.blade.php b/resources/themes/pterodactyl/server/files/list.blade.php index c52c38c42..9f2eb66ce 100644 --- a/resources/themes/pterodactyl/server/files/list.blade.php +++ b/resources/themes/pterodactyl/server/files/list.blade.php @@ -22,8 +22,8 @@ @lang('server.files.file_name') - @lang('server.files.size') - @lang('server.files.last_modified') + @lang('server.files.size') + @lang('server.files.last_modified')