admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#38828 (voorlopige) verbetering

Browse Source 
svn path=/Website/trunk/; revision=32210
This commit is contained in:
Koen Reefman
2017-01-04 13:47:21 +00:00
parent 6f8ad7f3a7
commit 4d414cd432
2 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/Localscripts/FcltMgr.js
View File

@@ -895,8 +895,7 @@ var FcltMgr =
// trucje om te zorgen dat *verlagen* ook gedetecteerd wordt
// Bewaar scrollTop om te voorkomen dat je naar boven springt
var tp = $(window.parent).scrollTop();
if($(helpFrame).prop("id") != "workFrame") // FSN#38828 - onderstaande regel veroorzaakt problemen
helpFrame.style.height = "10px"; // Anders geen bulkacties in lange lijsten
helpFrame.style.height = "10px"; // Anders geen bulkacties in lange lijsten
}
// Ooit nodig? In ieder geval problematisch met IE7 compatible $(helpFrame).width($(helpFrame).contents().width());

44
APPL/Localscripts/resultset_table_v2.js
View File

@@ -423,7 +423,8 @@ function showActions(event) // event op de mouseover van resultsettable
}
var isInline = this.parentNode.parentNode.parentNode.parentNode.parentNode.nodeName === "TD";
var inlineCorr = isInline ? ($("#rsMaxHistoryB")[0] ? 45 : 30) : 0;
var hasMaxHist = $("#rsMaxHistoryB")[0];
var inlineCorr = isInline ? (hasMaxHist ? 47 : 30) : 0;
if (useHamb != 0)
{
@@ -431,13 +432,50 @@ function showActions(event) // event op de mouseover van resultsettable
var hambImg = $(this).find("div.hamburger").children()[0];
$actiondiv.css('top', $(this).offset().top - inlineCorr);
var trHeight = $(this).outerHeight();
var pageHeight = $(window.parent).outerHeight();
var dropDownHeight = $actiondiv.outerHeight();
var pageBottom = pageHeight - (hasMaxHist ? 47 : 30);
var trTop = $(this).position().top - $(window.parent).scrollTop() - 5;
outsideFrame = $(window.frameElement).offset();
if (outsideFrame) trTop += outsideFrame.top;
var dropDownBottom = trTop + dropDownHeight;
var trBottom = trTop + trHeight;
var my, at;
if (trBottom > pageBottom)
{
my = 'bottom';
at = 'center';
}
else if (dropDownBottom > pageBottom)
{
my = 'bottom';
at = 'bottom';
}
else
{
my = 'top';
at = 'top';
}
$actiondiv.position({
my: my,
at: at,
of: this
});
if (hambImg) $actiondiv.css('left', $(hambImg).position().left + $(hambImg).width() + "px");
else
{
// afvangen? div.hamburger niet gevonden of heeft geen children()
}
}
else
{
@@ -455,7 +493,7 @@ function showActions(event) // event op de mouseover van resultsettable
}
}
if (useHamb == 2) updateEventHandlers(true);
FcltMgr.resized();
// FcltMgr.resized();
}
//actions[i].multiOnce