diff --git a/package.json b/package.json
index 1f67042e..27d28b1d 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,6 @@
"datatables.net-rowgroup-bs4": "^1.1.2",
"datatables.net-select": "^1.3.1",
"datatables.net-select-bs4": "^1.3.1",
- "dragscroll": "^0.0.8",
"fullcalendar": "^3.10.1",
"gettext-translator": "2.1.0",
"jquery": "3.5.1",
diff --git a/public/js/grocy.js b/public/js/grocy.js
index 67fd29ee..35a70acc 100644
--- a/public/js/grocy.js
+++ b/public/js/grocy.js
@@ -802,25 +802,25 @@ $('.table').on('column-sizing.dt', function(e, settings)
if (dtScrollWidth < tableWidth)
{
- $('.dataTables_scrollBody').addClass("grab-cursor");
+ $('.dataTables_scrollBody').addClass("no-force-overflow-visible");
$('.dataTables_scrollBody').removeClass("force-overflow-visible");
}
else
{
- $('.dataTables_scrollBody').removeClass("grab-cursor");
+ $('.dataTables_scrollBody').removeClass("no-force-overflow-visible");
$('.dataTables_scrollBody').addClass("force-overflow-visible");
}
});
$('td .dropdown').on('show.bs.dropdown', function(e)
{
- if ($('.dataTables_scrollBody').hasClass("grab-cursor"))
+ if ($('.dataTables_scrollBody').hasClass("no-force-overflow-visible"))
{
$('.dataTables_scrollBody').addClass("force-overflow-visible");
}
});
$("td .dropdown").on('hide.bs.dropdown', function(e)
{
- if ($('.dataTables_scrollBody').hasClass("grab-cursor"))
+ if ($('.dataTables_scrollBody').hasClass("no-force-overflow-visible"))
{
$('.dataTables_scrollBody').removeClass("force-overflow-visible");
}
diff --git a/public/viewjs/batteries.js b/public/viewjs/batteries.js
index 18fc7891..de12f057 100644
--- a/public/viewjs/batteries.js
+++ b/public/viewjs/batteries.js
@@ -7,8 +7,6 @@
});
$('#batteries-table tbody').removeClass("d-none");
batteriesTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/public/viewjs/batteriesjournal.js b/public/viewjs/batteriesjournal.js
index d8fc147c..6d11c157 100644
--- a/public/viewjs/batteriesjournal.js
+++ b/public/viewjs/batteriesjournal.js
@@ -8,8 +8,6 @@
});
$('#batteries-journal-table tbody').removeClass("d-none");
batteriesJournalTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#battery-filter").on("change", function()
{
diff --git a/public/viewjs/batteriesoverview.js b/public/viewjs/batteriesoverview.js
index 4ff3357a..8a739318 100644
--- a/public/viewjs/batteriesoverview.js
+++ b/public/viewjs/batteriesoverview.js
@@ -7,8 +7,6 @@
});
$('#batteries-overview-table tbody').removeClass("d-none");
batteriesOverviewTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/public/viewjs/chores.js b/public/viewjs/chores.js
index c4a145e5..54afde41 100644
--- a/public/viewjs/chores.js
+++ b/public/viewjs/chores.js
@@ -7,8 +7,6 @@
});
$('#chores-table tbody').removeClass("d-none");
choresTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/public/viewjs/choresjournal.js b/public/viewjs/choresjournal.js
index e4b1d398..5257edd2 100644
--- a/public/viewjs/choresjournal.js
+++ b/public/viewjs/choresjournal.js
@@ -8,8 +8,6 @@
});
$('#chores-journal-table tbody').removeClass("d-none");
choresJournalTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#chore-filter").on("change", function()
{
diff --git a/public/viewjs/choresoverview.js b/public/viewjs/choresoverview.js
index ce2f5153..bbcf4b79 100644
--- a/public/viewjs/choresoverview.js
+++ b/public/viewjs/choresoverview.js
@@ -7,8 +7,6 @@
});
$('#chores-overview-table tbody').removeClass("d-none");
choresOverviewTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/public/viewjs/equipment.js b/public/viewjs/equipment.js
index e675b5a6..f2a3e308 100644
--- a/public/viewjs/equipment.js
+++ b/public/viewjs/equipment.js
@@ -17,8 +17,6 @@
});
$('#equipment-table tbody').removeClass("d-none");
equipmentTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
equipmentTable.on('select', function(e, dt, type, indexes)
{
diff --git a/public/viewjs/locations.js b/public/viewjs/locations.js
index 27c2db5a..cc82df97 100644
--- a/public/viewjs/locations.js
+++ b/public/viewjs/locations.js
@@ -7,8 +7,6 @@
});
$('#locations-table tbody').removeClass("d-none");
locationsTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/public/viewjs/manageapikeys.js b/public/viewjs/manageapikeys.js
index c82f650f..167cb23d 100644
--- a/public/viewjs/manageapikeys.js
+++ b/public/viewjs/manageapikeys.js
@@ -7,8 +7,6 @@
});
$('#apikeys-table tbody').removeClass("d-none");
apiKeysTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
var createdApiKeyId = GetUriParam('CreatedApiKeyId');
if (createdApiKeyId !== undefined)
diff --git a/public/viewjs/productform.js b/public/viewjs/productform.js
index 53799159..436989bc 100644
--- a/public/viewjs/productform.js
+++ b/public/viewjs/productform.js
@@ -309,8 +309,6 @@ var barcodeTable = $('#barcode-table').DataTable({
});
$('#barcode-table tbody').removeClass("d-none");
barcodeTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
Grocy.Components.UserfieldsForm.Load();
$("#name").trigger("keyup");
diff --git a/public/viewjs/productgroups.js b/public/viewjs/productgroups.js
index 8c818e63..0271b06f 100644
--- a/public/viewjs/productgroups.js
+++ b/public/viewjs/productgroups.js
@@ -7,8 +7,6 @@
});
$('#productgroups-table tbody').removeClass("d-none");
groupsTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/public/viewjs/products.js b/public/viewjs/products.js
index 82909cb5..81b7a008 100644
--- a/public/viewjs/products.js
+++ b/public/viewjs/products.js
@@ -7,8 +7,6 @@
});
$('#products-table tbody').removeClass("d-none");
productsTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/public/viewjs/quantityunitform.js b/public/viewjs/quantityunitform.js
index ac64205f..45594380 100644
--- a/public/viewjs/quantityunitform.js
+++ b/public/viewjs/quantityunitform.js
@@ -143,8 +143,6 @@ var quConversionsTable = $('#qu-conversions-table').DataTable({
});
$('#qu-conversions-table tbody').removeClass("d-none");
quConversionsTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
Grocy.Components.UserfieldsForm.Load();
$("#name").trigger("keyup");
diff --git a/public/viewjs/quantityunits.js b/public/viewjs/quantityunits.js
index dbd9c3c8..af6bb150 100644
--- a/public/viewjs/quantityunits.js
+++ b/public/viewjs/quantityunits.js
@@ -7,8 +7,6 @@
});
$('#quantityunits-table tbody').removeClass("d-none");
quantityUnitsTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/public/viewjs/recipeform.js b/public/viewjs/recipeform.js
index 44c22346..53244ddd 100644
--- a/public/viewjs/recipeform.js
+++ b/public/viewjs/recipeform.js
@@ -97,8 +97,6 @@ var recipesIncludesTables = $('#recipes-includes-table').DataTable({
});
$('#recipes-includes-table tbody').removeClass("d-none");
recipesIncludesTables.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
Grocy.FrontendHelpers.ValidateForm('recipe-form');
$("#name").focus();
diff --git a/public/viewjs/recipes.js b/public/viewjs/recipes.js
index 6f922ade..c8249a2c 100644
--- a/public/viewjs/recipes.js
+++ b/public/viewjs/recipes.js
@@ -16,8 +16,6 @@
});
$('#recipes-table tbody').removeClass("d-none");
recipesTables.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
if ((typeof GetUriParam("tab") !== "undefined" && GetUriParam("tab") === "gallery") || window.localStorage.getItem("recipes_last_tab_id") == "gallery-tab")
{
diff --git a/public/viewjs/shoppinglist.js b/public/viewjs/shoppinglist.js
index c84b91cd..a8b0714f 100644
--- a/public/viewjs/shoppinglist.js
+++ b/public/viewjs/shoppinglist.js
@@ -29,8 +29,6 @@ var shoppingListTable = $('#shoppinglist-table').DataTable({
});
$('#shoppinglist-table tbody').removeClass("d-none");
shoppingListTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$(document).on("click", "tr.dtrg-group", function()
{
diff --git a/public/viewjs/shoppinglocations.js b/public/viewjs/shoppinglocations.js
index 29202714..bcff8388 100644
--- a/public/viewjs/shoppinglocations.js
+++ b/public/viewjs/shoppinglocations.js
@@ -7,8 +7,6 @@ var locationsTable = $('#shoppinglocations-table').DataTable({
});
$('#shoppinglocations-table tbody').removeClass("d-none");
locationsTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/public/viewjs/stockentries.js b/public/viewjs/stockentries.js
index 42a1d97b..0a5d64f5 100644
--- a/public/viewjs/stockentries.js
+++ b/public/viewjs/stockentries.js
@@ -7,8 +7,6 @@
});
$('#stockentries-table tbody').removeClass("d-none");
stockEntriesTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$.fn.dataTable.ext.search.push(function(settings, data, dataIndex)
{
diff --git a/public/viewjs/stockjournal.js b/public/viewjs/stockjournal.js
index 15df5599..2450b03d 100644
--- a/public/viewjs/stockjournal.js
+++ b/public/viewjs/stockjournal.js
@@ -8,8 +8,6 @@
});
$('#stock-journal-table tbody').removeClass("d-none");
stockJournalTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#product-filter").on("change", function()
{
diff --git a/public/viewjs/stockjournalsummary.js b/public/viewjs/stockjournalsummary.js
index 61aace52..de5e2af7 100644
--- a/public/viewjs/stockjournalsummary.js
+++ b/public/viewjs/stockjournalsummary.js
@@ -8,8 +8,6 @@ var journalSummaryTable = $('#stock-journal-summary-table').DataTable({
});
$('#stock-journal-summary-table tbody').removeClass("d-none");
journalSummaryTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#product-filter").on("change", function()
{
diff --git a/public/viewjs/stockoverview.js b/public/viewjs/stockoverview.js
index bf00262a..1dc8c9b0 100755
--- a/public/viewjs/stockoverview.js
+++ b/public/viewjs/stockoverview.js
@@ -16,8 +16,6 @@
$('#stock-overview-table tbody').removeClass("d-none");
stockOverviewTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#location-filter").on("change", function()
{
diff --git a/public/viewjs/taskcategories.js b/public/viewjs/taskcategories.js
index 92806f72..ac5e7472 100644
--- a/public/viewjs/taskcategories.js
+++ b/public/viewjs/taskcategories.js
@@ -7,8 +7,6 @@
});
$('#taskcategories-table tbody').removeClass("d-none");
categoriesTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/public/viewjs/tasks.js b/public/viewjs/tasks.js
index bd635f42..8ee5e391 100644
--- a/public/viewjs/tasks.js
+++ b/public/viewjs/tasks.js
@@ -11,8 +11,6 @@
});
$('#tasks-table tbody').removeClass("d-none");
tasksTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/public/viewjs/userentities.js b/public/viewjs/userentities.js
index bcdbe503..7abd955d 100644
--- a/public/viewjs/userentities.js
+++ b/public/viewjs/userentities.js
@@ -7,8 +7,6 @@
});
$('#userentities-table tbody').removeClass("d-none");
userentitiesTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/public/viewjs/userfields.js b/public/viewjs/userfields.js
index 71a748fb..f49c5c9e 100644
--- a/public/viewjs/userfields.js
+++ b/public/viewjs/userfields.js
@@ -7,8 +7,6 @@
});
$('#userfields-table tbody').removeClass("d-none");
userfieldsTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/public/viewjs/userobjects.js b/public/viewjs/userobjects.js
index f13a49f6..80ff9645 100644
--- a/public/viewjs/userobjects.js
+++ b/public/viewjs/userobjects.js
@@ -7,8 +7,6 @@
});
$('#userobjects-table tbody').removeClass("d-none");
userobjectsTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/public/viewjs/users.js b/public/viewjs/users.js
index a00dae93..db38b385 100644
--- a/public/viewjs/users.js
+++ b/public/viewjs/users.js
@@ -7,8 +7,6 @@
});
$('#users-table tbody').removeClass("d-none");
usersTable.columns.adjust().draw();
-$('.dataTables_scrollBody').addClass("dragscroll");
-dragscroll.reset();
$("#search").on("keyup", Delay(function()
{
diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php
index 556c8b7d..821abf7a 100644
--- a/views/layout/default.blade.php
+++ b/views/layout/default.blade.php
@@ -691,7 +691,6 @@
@if(!empty($__t('bootstrap-select_locale') && $__t('bootstrap-select_locale') != 'x'))@endif
-
diff --git a/yarn.lock b/yarn.lock
index 69348b68..44c666c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1277,11 +1277,6 @@ dotnet-deps-parser@4.10.0:
tslib "^1.10.0"
xml2js "0.4.23"
-dragscroll@^0.0.8:
- version "0.0.8"
- resolved "https://registry.yarnpkg.com/dragscroll/-/dragscroll-0.0.8.tgz#de4771e5f3a14d77b583ecef5d38bd9618f27563"
- integrity sha1-3kdx5fOhTXe1g+zvXTi9lhjydWM=
-
duplexer3@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"