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

Don't auto reload when database has changed in "fullscreen-card-mode" (fixes #88)

Browse Source
This commit is contained in:
Bernd Bestel
2018-10-13 09:18:16 +02:00
parent df7d360516
commit 4a35477c35
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/js/grocy.js
View File

@@ -338,6 +338,5 @@ ResizeResponsiveEmbeds = function(fillEntireViewport = false)
} }
$(window).on('resize', function() $(window).on('resize', function()
{ {
console.log($("body").hasClass("fullscreen-responsive-embed-active")); ResizeResponsiveEmbeds($("body").hasClass("fullscreen-card"));
ResizeResponsiveEmbeds($("body").hasClass("fullscreen-responsive-embed-active"));
}); });

2
public/js/grocy_dbchangedhandling.js
View File

@@ -22,7 +22,7 @@ setInterval(function()
{ {
if (Grocy.IdleTime >= 50) if (Grocy.IdleTime >= 50)
{ {
if (BoolVal(Grocy.UserSettings.auto_reload_on_db_change) && $("form.is-dirty").length === 0) if (BoolVal(Grocy.UserSettings.auto_reload_on_db_change) && $("form.is-dirty").length === 0 && !$("body").hasClass("fullscreen-card"))
{ {
window.location.reload(); window.location.reload();
} }

2
public/viewjs/equipment.js
View File

@@ -116,7 +116,7 @@ $("#selectedEquipmentInstructionManualToggleFullscreenButton").on('click', funct
$("#selectedEquipmentInstructionManualCard").toggleClass("fullscreen"); $("#selectedEquipmentInstructionManualCard").toggleClass("fullscreen");
$("#selectedEquipmentInstructionManualCard .card-header").toggleClass("fixed-top"); $("#selectedEquipmentInstructionManualCard .card-header").toggleClass("fixed-top");
$("#selectedEquipmentInstructionManualCard .card-body").toggleClass("mt-5"); $("#selectedEquipmentInstructionManualCard .card-body").toggleClass("mt-5");
$("body").toggleClass("fullscreen-responsive-embed-active"); $("body").toggleClass("fullscreen-card");
ResizeResponsiveEmbeds(true); ResizeResponsiveEmbeds(true);
}); });

1
public/viewjs/recipes.js
View File

@@ -158,6 +158,7 @@ recipesTables.on('select', function(e, dt, type, indexes)
$("#selectedRecipeToggleFullscreenButton").on('click', function(e) $("#selectedRecipeToggleFullscreenButton").on('click', function(e)
{ {
$("#selectedRecipeCard").toggleClass("fullscreen"); $("#selectedRecipeCard").toggleClass("fullscreen");
$("body").toggleClass("fullscreen-card");
$("#selectedRecipeCard .card-header").toggleClass("fixed-top"); $("#selectedRecipeCard .card-header").toggleClass("fixed-top");
$("#selectedRecipeCard .card-body").toggleClass("mt-5"); $("#selectedRecipeCard .card-body").toggleClass("mt-5");
}); });