FSN#34665 1&2 opgelost, 3 nietgevonden

svn path=/Website/trunk/; revision=31500
This commit is contained in:
2016-11-16 11:54:54 +00:00
parent 4a192bfa2e
commit a2da4cd199
4 changed files with 10 additions and 4 deletions

View File

@@ -428,10 +428,12 @@ function updateTableHeaders() {
floatingHeaderRow.css("width", $(this).css("width")-1);
var insideFrame = $(this).offset();
var outsideFrame = $(window.frameElement).offset();
var scrollTop = $(window.parent).scrollTop();
var scrollTop = $(window.parent).scrollTop() + $(window).scrollTop();
var offset = 0;
if (insideFrame) offset += insideFrame.top;
if (outsideFrame) offset += outsideFrame.top;
if (outsideFrame && $(window.parent).scrollTop() != 0) offset += outsideFrame.top;
// if browser is IE then correct the top positioning
var IEcorr = (/*@cc_on!@*/false)?-4:0;
@@ -467,6 +469,8 @@ $(function() {
originalHeaderRow.addClass("tableFloatingHeaderOriginal");
});
$(window).scroll(updateTableHeaders);
$(window).resize(updateTableHeaders);
$(window.parent).scroll(updateTableHeaders);
$(window.parent).resize(updateTableHeaders);
$('div.collapsed').on("click", updateTableHeaders);

View File

@@ -236,7 +236,8 @@ function hideActions(event)
{
if ((useHamb == 0 && window.activerow != this) || (useHamb != 0 && $currentActionsDiv().css('display') != "none")) // voorkom hide als je muis boven de buttons beweegt
$currentActionsDiv().hide();
event.stopPropagation();
if (event)
event.stopPropagation();
}
function hambSetCursor(event)

View File

@@ -55,6 +55,7 @@ function scaffolding_search(model, scf_params)
function pick_columns(deze)
{
$("#scfcolpicker").show();
updateTableHeaders();
$("#scfcolpicker").css("left", window.fcltevent.clientX - $("#scfcolpicker").width() - 50);
}

View File

@@ -95,7 +95,7 @@ function CreateButtons(buttons, params)
if (hamburger && !params.isDialog)
{
var btn = { icon: "fa-bars", tooltip: L("lcl_more"), id: "printhamburger",
action: "$('li.byHamburger').toggleClass('hidden');FcltMgr.resized();hideHambDropDown();" }
action: "$('li.byHamburger').toggleClass('hidden');FcltMgr.resized();hideActions();" }
CreateButton(null, btn.action, btn, params );
}
%>