kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-13 17:27:23 +00:00
Code Issues Projects Releases Wiki Activity

Removed dragscroll dependency (fixes #1135, references #1115)

Browse Source
This commit is contained in:
Bernd Bestel
2020-11-17 20:50:04 +01:00
parent e32d12699e
commit d2d09cf928
32 changed files with 4 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@@ -20,7 +20,6 @@
"datatables.net-rowgroup-bs4": "^1.1.2", "datatables.net-rowgroup-bs4": "^1.1.2",
"datatables.net-select": "^1.3.1", "datatables.net-select": "^1.3.1",
"datatables.net-select-bs4": "^1.3.1", "datatables.net-select-bs4": "^1.3.1",
"dragscroll": "^0.0.8",
"fullcalendar": "^3.10.1", "fullcalendar": "^3.10.1",
"gettext-translator": "2.1.0", "gettext-translator": "2.1.0",
"jquery": "3.5.1", "jquery": "3.5.1",

8
public/js/grocy.js
View File

@@ -802,25 +802,25 @@ $('.table').on('column-sizing.dt', function(e, settings)
if (dtScrollWidth < tableWidth) if (dtScrollWidth < tableWidth)
{ {
$('.dataTables_scrollBody').addClass("grab-cursor"); $('.dataTables_scrollBody').addClass("no-force-overflow-visible");
$('.dataTables_scrollBody').removeClass("force-overflow-visible"); $('.dataTables_scrollBody').removeClass("force-overflow-visible");
} }
else else
{ {
$('.dataTables_scrollBody').removeClass("grab-cursor"); $('.dataTables_scrollBody').removeClass("no-force-overflow-visible");
$('.dataTables_scrollBody').addClass("force-overflow-visible"); $('.dataTables_scrollBody').addClass("force-overflow-visible");
} }
}); });
$('td .dropdown').on('show.bs.dropdown', function(e) $('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"); $('.dataTables_scrollBody').addClass("force-overflow-visible");
} }
}); });
$("td .dropdown").on('hide.bs.dropdown', function(e) $("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"); $('.dataTables_scrollBody').removeClass("force-overflow-visible");
} }

2
public/viewjs/batteries.js
View File

@@ -7,8 +7,6 @@
}); });
$('#batteries-table tbody').removeClass("d-none"); $('#batteries-table tbody').removeClass("d-none");
batteriesTable.columns.adjust().draw(); batteriesTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

2
public/viewjs/batteriesjournal.js
View File

@@ -8,8 +8,6 @@
}); });
$('#batteries-journal-table tbody').removeClass("d-none"); $('#batteries-journal-table tbody').removeClass("d-none");
batteriesJournalTable.columns.adjust().draw(); batteriesJournalTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#battery-filter").on("change", function() $("#battery-filter").on("change", function()
{ {

2
public/viewjs/batteriesoverview.js
View File

@@ -7,8 +7,6 @@
}); });
$('#batteries-overview-table tbody').removeClass("d-none"); $('#batteries-overview-table tbody').removeClass("d-none");
batteriesOverviewTable.columns.adjust().draw(); batteriesOverviewTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

2
public/viewjs/chores.js
View File

@@ -7,8 +7,6 @@
}); });
$('#chores-table tbody').removeClass("d-none"); $('#chores-table tbody').removeClass("d-none");
choresTable.columns.adjust().draw(); choresTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

2
public/viewjs/choresjournal.js
View File

@@ -8,8 +8,6 @@
}); });
$('#chores-journal-table tbody').removeClass("d-none"); $('#chores-journal-table tbody').removeClass("d-none");
choresJournalTable.columns.adjust().draw(); choresJournalTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#chore-filter").on("change", function() $("#chore-filter").on("change", function()
{ {

2
public/viewjs/choresoverview.js
View File

@@ -7,8 +7,6 @@
}); });
$('#chores-overview-table tbody').removeClass("d-none"); $('#chores-overview-table tbody').removeClass("d-none");
choresOverviewTable.columns.adjust().draw(); choresOverviewTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

2
public/viewjs/equipment.js
View File

@@ -17,8 +17,6 @@
}); });
$('#equipment-table tbody').removeClass("d-none"); $('#equipment-table tbody').removeClass("d-none");
equipmentTable.columns.adjust().draw(); equipmentTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
equipmentTable.on('select', function(e, dt, type, indexes) equipmentTable.on('select', function(e, dt, type, indexes)
{ {

2
public/viewjs/locations.js
View File

@@ -7,8 +7,6 @@
}); });
$('#locations-table tbody').removeClass("d-none"); $('#locations-table tbody').removeClass("d-none");
locationsTable.columns.adjust().draw(); locationsTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

2
public/viewjs/manageapikeys.js
View File

@@ -7,8 +7,6 @@
}); });
$('#apikeys-table tbody').removeClass("d-none"); $('#apikeys-table tbody').removeClass("d-none");
apiKeysTable.columns.adjust().draw(); apiKeysTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
var createdApiKeyId = GetUriParam('CreatedApiKeyId'); var createdApiKeyId = GetUriParam('CreatedApiKeyId');
if (createdApiKeyId !== undefined) if (createdApiKeyId !== undefined)

2
public/viewjs/productform.js
View File

@@ -309,8 +309,6 @@ var barcodeTable = $('#barcode-table').DataTable({
}); });
$('#barcode-table tbody').removeClass("d-none"); $('#barcode-table tbody').removeClass("d-none");
barcodeTable.columns.adjust().draw(); barcodeTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
Grocy.Components.UserfieldsForm.Load(); Grocy.Components.UserfieldsForm.Load();
$("#name").trigger("keyup"); $("#name").trigger("keyup");

2
public/viewjs/productgroups.js
View File

@@ -7,8 +7,6 @@
}); });
$('#productgroups-table tbody').removeClass("d-none"); $('#productgroups-table tbody').removeClass("d-none");
groupsTable.columns.adjust().draw(); groupsTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

2
public/viewjs/products.js
View File

@@ -7,8 +7,6 @@
}); });
$('#products-table tbody').removeClass("d-none"); $('#products-table tbody').removeClass("d-none");
productsTable.columns.adjust().draw(); productsTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

2
public/viewjs/quantityunitform.js
View File

@@ -143,8 +143,6 @@ var quConversionsTable = $('#qu-conversions-table').DataTable({
}); });
$('#qu-conversions-table tbody').removeClass("d-none"); $('#qu-conversions-table tbody').removeClass("d-none");
quConversionsTable.columns.adjust().draw(); quConversionsTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
Grocy.Components.UserfieldsForm.Load(); Grocy.Components.UserfieldsForm.Load();
$("#name").trigger("keyup"); $("#name").trigger("keyup");

2
public/viewjs/quantityunits.js
View File

@@ -7,8 +7,6 @@
}); });
$('#quantityunits-table tbody').removeClass("d-none"); $('#quantityunits-table tbody').removeClass("d-none");
quantityUnitsTable.columns.adjust().draw(); quantityUnitsTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

2
public/viewjs/recipeform.js
View File

@@ -97,8 +97,6 @@ var recipesIncludesTables = $('#recipes-includes-table').DataTable({
}); });
$('#recipes-includes-table tbody').removeClass("d-none"); $('#recipes-includes-table tbody').removeClass("d-none");
recipesIncludesTables.columns.adjust().draw(); recipesIncludesTables.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
Grocy.FrontendHelpers.ValidateForm('recipe-form'); Grocy.FrontendHelpers.ValidateForm('recipe-form');
$("#name").focus(); $("#name").focus();

2
public/viewjs/recipes.js
View File

@@ -16,8 +16,6 @@
}); });
$('#recipes-table tbody').removeClass("d-none"); $('#recipes-table tbody').removeClass("d-none");
recipesTables.columns.adjust().draw(); 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") if ((typeof GetUriParam("tab") !== "undefined" && GetUriParam("tab") === "gallery") || window.localStorage.getItem("recipes_last_tab_id") == "gallery-tab")
{ {

2
public/viewjs/shoppinglist.js
View File

@@ -29,8 +29,6 @@ var shoppingListTable = $('#shoppinglist-table').DataTable({
}); });
$('#shoppinglist-table tbody').removeClass("d-none"); $('#shoppinglist-table tbody').removeClass("d-none");
shoppingListTable.columns.adjust().draw(); shoppingListTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$(document).on("click", "tr.dtrg-group", function() $(document).on("click", "tr.dtrg-group", function()
{ {

2
public/viewjs/shoppinglocations.js
View File

@@ -7,8 +7,6 @@ var locationsTable = $('#shoppinglocations-table').DataTable({
}); });
$('#shoppinglocations-table tbody').removeClass("d-none"); $('#shoppinglocations-table tbody').removeClass("d-none");
locationsTable.columns.adjust().draw(); locationsTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

2
public/viewjs/stockentries.js
View File

@@ -7,8 +7,6 @@
}); });
$('#stockentries-table tbody').removeClass("d-none"); $('#stockentries-table tbody').removeClass("d-none");
stockEntriesTable.columns.adjust().draw(); stockEntriesTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$.fn.dataTable.ext.search.push(function(settings, data, dataIndex) $.fn.dataTable.ext.search.push(function(settings, data, dataIndex)
{ {

2
public/viewjs/stockjournal.js
View File

@@ -8,8 +8,6 @@
}); });
$('#stock-journal-table tbody').removeClass("d-none"); $('#stock-journal-table tbody').removeClass("d-none");
stockJournalTable.columns.adjust().draw(); stockJournalTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#product-filter").on("change", function() $("#product-filter").on("change", function()
{ {

2
public/viewjs/stockjournalsummary.js
View File

@@ -8,8 +8,6 @@ var journalSummaryTable = $('#stock-journal-summary-table').DataTable({
}); });
$('#stock-journal-summary-table tbody').removeClass("d-none"); $('#stock-journal-summary-table tbody').removeClass("d-none");
journalSummaryTable.columns.adjust().draw(); journalSummaryTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#product-filter").on("change", function() $("#product-filter").on("change", function()
{ {

2
public/viewjs/stockoverview.js
View File

@@ -16,8 +16,6 @@
$('#stock-overview-table tbody').removeClass("d-none"); $('#stock-overview-table tbody').removeClass("d-none");
stockOverviewTable.columns.adjust().draw(); stockOverviewTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#location-filter").on("change", function() $("#location-filter").on("change", function()
{ {

2
public/viewjs/taskcategories.js
View File

@@ -7,8 +7,6 @@
}); });
$('#taskcategories-table tbody').removeClass("d-none"); $('#taskcategories-table tbody').removeClass("d-none");
categoriesTable.columns.adjust().draw(); categoriesTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

2
public/viewjs/tasks.js
View File

@@ -11,8 +11,6 @@
}); });
$('#tasks-table tbody').removeClass("d-none"); $('#tasks-table tbody').removeClass("d-none");
tasksTable.columns.adjust().draw(); tasksTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

2
public/viewjs/userentities.js
View File

@@ -7,8 +7,6 @@
}); });
$('#userentities-table tbody').removeClass("d-none"); $('#userentities-table tbody').removeClass("d-none");
userentitiesTable.columns.adjust().draw(); userentitiesTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

2
public/viewjs/userfields.js
View File

@@ -7,8 +7,6 @@
}); });
$('#userfields-table tbody').removeClass("d-none"); $('#userfields-table tbody').removeClass("d-none");
userfieldsTable.columns.adjust().draw(); userfieldsTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

2
public/viewjs/userobjects.js
View File

@@ -7,8 +7,6 @@
}); });
$('#userobjects-table tbody').removeClass("d-none"); $('#userobjects-table tbody').removeClass("d-none");
userobjectsTable.columns.adjust().draw(); userobjectsTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

2
public/viewjs/users.js
View File

@@ -7,8 +7,6 @@
}); });
$('#users-table tbody').removeClass("d-none"); $('#users-table tbody').removeClass("d-none");
usersTable.columns.adjust().draw(); usersTable.columns.adjust().draw();
$('.dataTables_scrollBody').addClass("dragscroll");
dragscroll.reset();
$("#search").on("keyup", Delay(function() $("#search").on("keyup", Delay(function()
{ {

1
views/layout/default.blade.php
View File

@@ -691,7 +691,6 @@
@if(!empty($__t('bootstrap-select_locale') && $__t('bootstrap-select_locale') != 'x'))<script src="{{ $U('/node_modules', true) }}/bootstrap-select/dist/js/i18n/defaults-{{ $__t('bootstrap-select_locale') }}.js?v={{ $version }}"></script>@endif @if(!empty($__t('bootstrap-select_locale') && $__t('bootstrap-select_locale') != 'x'))<script src="{{ $U('/node_modules', true) }}/bootstrap-select/dist/js/i18n/defaults-{{ $__t('bootstrap-select_locale') }}.js?v={{ $version }}"></script>@endif
<script src="{{ $U('/node_modules/jquery-lazy/jquery.lazy.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/node_modules/jquery-lazy/jquery.lazy.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/nosleep.js/dist/NoSleep.min.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/node_modules/nosleep.js/dist/NoSleep.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/dragscroll/dragscroll.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/js/extensions.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/js/extensions.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/js/grocy.js?v=', true) }}{{ $version }}"></script> <script src="{{ $U('/js/grocy.js?v=', true) }}{{ $version }}"></script>

5
yarn.lock
View File

@@ -1277,11 +1277,6 @@ dotnet-deps-parser@4.10.0:
tslib "^1.10.0" tslib "^1.10.0"
xml2js "0.4.23" 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: duplexer3@^0.1.4:
version "0.1.4" version "0.1.4"
resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"