Skip to content

Commit 5567269

Browse files
committed
Fix menu toggle element element hiding, better mobile support
1 parent da92796 commit 5567269

File tree

3 files changed

+30
-16
lines changed

3 files changed

+30
-16
lines changed

public/themes/pterodactyl/css/pterodactyl.css

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ code {
7575
}
7676

7777
.hasFileHover * {
78-
pointer-events: none;
78+
pointer-events: none !important;
7979
}
8080

8181
td.has-progress {
@@ -103,3 +103,13 @@ td.has-progress {
103103
.use-pointer {
104104
cursor: pointer !important;
105105
}
106+
107+
.input-loader {
108+
display: none;
109+
position:relative;
110+
top: -23px;
111+
float: right;
112+
right: 5px;
113+
color: #cccccc;
114+
height: 0;
115+
}

public/themes/pterodactyl/js/frontend/files/src/contextmenu.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class ContextMenuClass {
8383
}
8484

8585
rightClick() {
86-
$('[data-action="toggleMenu"]').on('mousedown', () => {
86+
$('[data-action="toggleMenu"]').on('mousedown', event => {
8787
event.preventDefault();
8888
this.showMenu(event);
8989
});
@@ -173,8 +173,12 @@ class ContextMenuClass {
173173
});
174174
}
175175

176-
$(window).on('click', () => {
177-
$(menu).remove();
176+
$(window).unbind().on('click', event => {
177+
if($(event.target).is('.disable-menu-hide')) {
178+
event.preventDefault();
179+
return;
180+
}
181+
$(menu).unbind().remove();
178182
if(!_.isNull(this.activeLine)) this.activeLine.removeClass('active');
179183
});
180184
}

resources/themes/pterodactyl/server/files/list.blade.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<tr>
2323
<th style="width:2%;text-align:center;" class="middle"><i class="fa fa-refresh muted muted-hover use-pointer" data-action="reload-files"></i></th>
2424
<th style="width:55%">@lang('server.files.file_name')</th>
25-
<th style="width:15%">@lang('server.files.size')</th>
26-
<th style="width:20%">@lang('server.files.last_modified')</th>
25+
<th style="width:15%" class="hidden-xs">@lang('server.files.size')</th>
26+
<th style="width:20%" class="hidden-xs">@lang('server.files.last_modified')</th>
2727
<th style="width:8%">
2828
<label class="btn btn-primary btn-xs btn-file">
2929
Upload <input type="file" id="files_touch_target" style="display: none;"/>
@@ -47,8 +47,8 @@
4747
<tr data-type="disabled">
4848
<td><i class="fa fa-folder" style="margin-left: 0.859px;"></i></td>
4949
<td><a href="/server/{{ $server->uuidShort }}/files" data-action="directory-view">&larr;</a></a></td>
50-
<td></td>
51-
<td></td>
50+
<td class="hidden-xs"></td>
51+
<td class="hidden-xs"></td>
5252
<td></td>
5353
</tr>
5454
@endif
@@ -58,8 +58,8 @@
5858
<td data-name="{{ rawurlencode($directory['link']) }}">
5959
<a href="/server/{{ $server->uuidShort }}/files" data-action="directory-view">&larr; {{ $directory['link_show'] }}</a>
6060
</td>
61-
<td></td>
62-
<td></td>
61+
<td class="hidden-xs"></td>
62+
<td class="hidden-xs"></td>
6363
<td></td>
6464
</tr>
6565
@endif
@@ -69,8 +69,8 @@
6969
<td data-identifier="name" data-name="{{ rawurlencode($folder['entry']) }}" data-path="@if($folder['directory'] !== ''){{ rawurlencode($folder['directory']) }}@endif/">
7070
<a href="/server/{{ $server->uuidShort }}/files" data-action="directory-view">{{ $folder['entry'] }}</a>
7171
</td>
72-
<td data-identifier="size">{{ $folder['size'] }}</td>
73-
<td data-identifier="modified">
72+
<td data-identifier="size" class="hidden-xs">{{ $folder['size'] }}</td>
73+
<td data-identifier="modified" class="hidden-xs">
7474
<?php $carbon = Carbon::createFromTimestamp($folder['date'])->timezone(env('APP_TIMEZONE', 'America/New_York')); ?>
7575
@if($carbon->diffInMinutes(Carbon::now()) > 60)
7676
{{ $carbon->format('m/d/y H:i:s') }}
@@ -80,7 +80,7 @@
8080
{{ $carbon->diffForHumans() }}
8181
@endif
8282
</td>
83-
<td><button class="btn btn-xxs btn-default" data-action="toggleMenu" style="padding:2px 6px 0px;"><i class="fa fa-ellipsis-h"></i></button></td>
83+
<td><button class="btn btn-xxs btn-default disable-menu-hide" data-action="toggleMenu" style="padding:2px 6px 0px;"><i class="fa fa-ellipsis-h disable-menu-hide"></i></button></td>
8484
</tr>
8585
@endforeach
8686
@foreach ($files as $file)
@@ -146,8 +146,8 @@
146146
{{ $file['entry'] }}
147147
@endif
148148
</td>
149-
<td data-identifier="size">{{ $file['size'] }}</td>
150-
<td data-identifier="modified">
149+
<td data-identifier="size" class="hidden-xs">{{ $file['size'] }}</td>
150+
<td data-identifier="modified" class="hidden-xs">
151151
<?php $carbon = Carbon::createFromTimestamp($file['date'])->timezone(env('APP_TIMEZONE', 'America/New_York')); ?>
152152
@if($carbon->diffInMinutes(Carbon::now()) > 60)
153153
{{ $carbon->format('m/d/y H:i:s') }}
@@ -157,7 +157,7 @@
157157
{{ $carbon->diffForHumans() }}
158158
@endif
159159
</td>
160-
<td><button class="btn btn-xxs btn-default" data-action="toggleMenu" style="padding:2px 6px 0px;"><i class="fa fa-ellipsis-h"></i></button></td>
160+
<td><button class="btn btn-xxs btn-default disable-menu-hide" data-action="toggleMenu" style="padding:2px 6px 0px;"><i class="fa fa-ellipsis-h disable-menu-hide"></i></button></td>
161161
</tr>
162162
@endforeach
163163
</tbody>

0 commit comments

Comments
 (0)