kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 20:26:42 +00:00
Code Issues Projects Releases Wiki Activity

More modal iframe dialog handling improvements

Browse Source
This commit is contained in:
Bernd Bestel
2025-01-11 12:06:15 +01:00
parent 5721c4bd62
commit 2c0b1a7be0
54 changed files with 110 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
public/js/grocy.js
View File

@@ -542,7 +542,16 @@ ResizeResponsiveEmbeds = function()
{
$("iframe.embed-responsive").each(function()
{
$(this).attr("height", $(this)[0].contentWindow.document.body.scrollHeight.toString() + "px");
var iframeBody = $(this)[0].contentWindow.document.body;
if (iframeBody)
{
$(this).attr("height", iframeBody.scrollHeight.toString() + "px");
}
if ($("body").hasClass("fullscreen-card"))
{
$(this).attr("height", $("body").height().toString() + "px");
}
});
var maxHeight = $("body").height() - $("#mainNav").outerHeight() - 62;
@@ -550,7 +559,7 @@ ResizeResponsiveEmbeds = function()
{
maxHeight = $("body").height();
}
$("embed.embed-responsive").attr("height", maxHeight.toString() + "px");
$("embed.embed-responsive:not(.resize-done)").attr("height", maxHeight.toString() + "px").addClass("resize-done");
}
$(window).on("resize", function()
{
@@ -564,6 +573,10 @@ $(document).on("shown.bs.modal", function(e)
{
ResizeResponsiveEmbeds();
});
$(document).on("hidden.bs.modal", function(e)
{
$("body").removeClass("fullscreen-card");
});
$("body").children().each(function(index, child)
{
new ResizeObserver(function()
@@ -705,8 +718,8 @@ if (Grocy.CalendarFirstDayOfWeek)
if (GetUriParam("embedded"))
{
$("body").append('<div class="fixed-top"> \
<button class="btn btn-light float-right close-last-modal-button" \
$("body").append('<div class="fixed-top" style="left: unset;"> \
<button class="btn btn-light btn-sm close-last-modal-button" \
type="button" \> \
<i class="fa-solid fa-xmark"></i> \
</button> \
@@ -737,7 +750,7 @@ $(window).on("message", function(e)
}
else if (data.Message == "CloseLastModal")
{
$(".modal").last().modal("hide");
$(".modal:visible").last().modal("hide");
}
else if (data.Message == "ResizeResponsiveEmbeds")
{
@@ -753,11 +766,15 @@ $(window).on("message", function(e)
}
else if (data.Message == "BroadcastMessage")
{
// data.Payload is the original WindowMessageBag => distribute to this window + all child iframes
// data.Payload is the original WindowMessageBag
// => Send the original message to this window
window.postMessage(data.Payload, Grocy.BaseUrl);
// => Bubble the broadcast message down to all child iframes
$("iframe.embed-responsive").each(function()
{
$(this)[0].contentWindow.postMessage(data.Payload, Grocy.BaseUrl);
$(this)[0].contentWindow.postMessage(data, Grocy.BaseUrl);
});
}
});