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

Handle window.top in embedded iframe situations (fixes #2686)

Browse Source
This commit is contained in:
Bernd Bestel
2025-02-24 19:52:43 +01:00
parent ce5be6645e
commit 2b994fd2ee
8 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
public/js/grocy.js
View File

@@ -786,6 +786,34 @@ $(window).on("message", function(e)
}
});
window.IsGrocy = true;
Grocy.GetTopmostWindow = function()
{
if (window.top.IsGrocy)
{
// If the top window is Grocy (so when we're currently not running in an iframe) return that immediately
return window.top;
}
else
{
// Otherwise, so when we're currently running in an iframe, climb up the window chain and check for the top most Grocy window
var topmostGrocyWindow = window;
var currentWindow = window;
while (currentWindow != window.top)
{
if (currentWindow.IsGrocy)
{
topmostGrocyWindow = currentWindow;
}
currentWindow = currentWindow.parent;
}
return topmostGrocyWindow;
}
}
$(document).on("click", ".show-as-dialog-link", function(e)
{
e.preventDefault();
@@ -799,10 +827,9 @@ $(document).on("click", ".show-as-dialog-link", function(e)
dialogType = element.attr("data-dialog-type")
}
if (window.top != window.self)
if (Grocy.GetTopmostWindow() != window.self)
{
window.top.postMessage(WindowMessageBag("IframeModal", { "Link": link, "DialogType": dialogType }), Grocy.BaseUrl);
Grocy.GetTopmostWindow().postMessage(WindowMessageBag("IframeModal", { "Link": link, "DialogType": dialogType }), Grocy.BaseUrl);
}
else
{