mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2024-08-30 18:23:09 +00:00
Merge branch 'darthleo-disable-mobile-sorting' into 'dev'
Disable server sorting on mobile See merge request crafty-controller/crafty-commander!220
This commit is contained in:
commit
85d6f102e5
@ -265,6 +265,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<!-- content-wrapper ends -->
|
<!-- content-wrapper ends -->
|
||||||
|
<div id="mobile"></div>
|
||||||
<style>
|
<style>
|
||||||
.popover-body {
|
.popover-body {
|
||||||
color: white !important;
|
color: white !important;
|
||||||
@ -586,6 +587,19 @@
|
|||||||
<script src="/static/assets/js/jquery-ui.js"></script>
|
<script src="/static/assets/js/jquery-ui.js"></script>
|
||||||
<link rel="stylesheet" href="/static/assets/css/jquery-ui.css">
|
<link rel="stylesheet" href="/static/assets/css/jquery-ui.css">
|
||||||
<link rel="stylesheet" href="/static/assets/css/jquery-ui.structure.css">
|
<link rel="stylesheet" href="/static/assets/css/jquery-ui.structure.css">
|
||||||
|
<style>
|
||||||
|
@media only screen and (max-width: 760px) {
|
||||||
|
#mobile { display: none; }
|
||||||
|
}
|
||||||
|
.ui-sortable-handle {
|
||||||
|
cursor: default;
|
||||||
|
padding:2px;
|
||||||
|
}
|
||||||
|
.ui-sortable-handle:hover {
|
||||||
|
cursor: grab !important;
|
||||||
|
padding:2px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
/* Search Bar */
|
/* Search Bar */
|
||||||
@ -601,8 +615,9 @@
|
|||||||
|
|
||||||
$(document).on("mousedown keyup click", function(event) {
|
$(document).on("mousedown keyup click", function(event) {
|
||||||
const value = $('.dataTables_filter input').val();
|
const value = $('.dataTables_filter input').val();
|
||||||
|
const is_mobile = $('#mobile').css('display')=='none';
|
||||||
|
|
||||||
if ($("table#servers_table tbody").sortable("toArray").length > 1 && value === '') {
|
if ($("table#servers_table tbody").sortable("toArray").length > 1 && value === '' && !is_mobile) {
|
||||||
$("table#servers_table tbody").sortable("enable");
|
$("table#servers_table tbody").sortable("enable");
|
||||||
} else {
|
} else {
|
||||||
$("table#servers_table tbody").sortable("disable");
|
$("table#servers_table tbody").sortable("disable");
|
||||||
@ -631,9 +646,10 @@ $(document).ready(function() {
|
|||||||
$("table#servers_table tbody")
|
$("table#servers_table tbody")
|
||||||
.sortable({
|
.sortable({
|
||||||
items: '> tr',
|
items: '> tr',
|
||||||
cursor: "move",
|
cursor: "grabbing",
|
||||||
axis: "y",
|
axis: "y",
|
||||||
revert: true,
|
revert: true,
|
||||||
|
handle:"i.fas.fa-server,a",
|
||||||
forcePlaceholderSize: true,
|
forcePlaceholderSize: true,
|
||||||
placeholder:'table-placeholder',
|
placeholder:'table-placeholder',
|
||||||
deactivate: function(event, ui) {
|
deactivate: function(event, ui) {
|
||||||
@ -657,7 +673,10 @@ $(document).ready(function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Fixes the appearance of a scrollbar when a user tries to drag an item too low
|
// Fixes the appearance of a scrollbar when a user tries to drag an item too low
|
||||||
$("div#servers_table_wrapper").css({ overflow: "hidden" });
|
// Disabled on mobile since sorting is disabled on mobile
|
||||||
|
if($('#mobile').css('display') != 'none'){
|
||||||
|
$("div#servers_table_wrapper").css({ overflow: "hidden" });
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
Loading…
Reference in New Issue
Block a user