diff --git a/APPL/Localscripts/resultset_table_v2.js b/APPL/Localscripts/resultset_table_v2.js index 5ea464482f..5883d59117 100644 --- a/APPL/Localscripts/resultset_table_v2.js +++ b/APPL/Localscripts/resultset_table_v2.js @@ -433,12 +433,14 @@ function showActions(event) // event op de mouseover van resultsettable var hambImg = $(this).find("div.hamburger").children()[0]; var trHeight = $(this).outerHeight(); - var pageHeight = $(window.parent).outerHeight(); + var outBounds = $(window.parent).outerHeight() < $(window).outerHeight(); + var pageHeight = outBounds ? $(window.parent).outerHeight() : $(window).outerHeight(); var dropDownHeight = $actiondiv.outerHeight() - 5; var scrollCorr = 0; outsideFrame = $(window.frameElement).offset(); - if (outsideFrame) scrollCorr = $(window.parent).scrollTop() - outsideFrame.top; + if (outsideFrame && outBounds) + scrollCorr = $(window.parent).scrollTop() - outsideFrame.top; var trTop = $(this).offset().top; var pageBottom = pageHeight + scrollCorr; diff --git a/APPL/Shared/resultset_table_v2.inc b/APPL/Shared/resultset_table_v2.inc index 576bdf5055..cd6d337608 100644 --- a/APPL/Shared/resultset_table_v2.inc +++ b/APPL/Shared/resultset_table_v2.inc @@ -732,7 +732,7 @@ function __rsProcessResultset(processParams) // processParams wordt blind aan al actionsDiv += val + this.actions[i].caption + ""; } hasInlineActions = aantalInline > 0; - html += "\n"; + html += "\n"; html += "\n"