yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes: U4-7440 Grid - Controls overlay is cut of by the tree

Browse Source
This commit is contained in:
Mads Rasmussen
2015-11-30 19:34:23 +01:00
parent 09f0f951a1
commit bf037b3dd7
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
View File

@@ -144,8 +144,12 @@
function setTargetPosition() {
var viewportWidth = null;
var viewportHeight = null;
var container = $("#contentwrapper");
var containerLeft = container[0].offsetLeft;
var containerRight = containerLeft + container[0].offsetWidth;
var containerTop = container[0].offsetTop;
var containerBottom = containerTop + container[0].offsetHeight;
var mousePositionClickX = null;
var mousePositionClickY = null;
var elementHeight = null;
@@ -161,10 +165,6 @@
// if mouse click position is know place element with mouse in center
if (scope.model.event && scope.model.event) {
// viewport size
viewportWidth = $(window).innerWidth();
viewportHeight = $(window).innerHeight();
// click position
mousePositionClickX = scope.model.event.pageX;
mousePositionClickY = scope.model.event.pageY;
@@ -179,17 +179,29 @@
// check to see if element is outside screen
// outside right
if (position.left + elementWidth > viewportWidth) {
position.right = 0;
if (position.left + elementWidth > containerRight) {
position.right = 10;
position.left = "inherit";
}
// outside bottom
if (position.top + elementHeight > viewportHeight) {
position.bottom = 0;
if (position.top + elementHeight > containerBottom) {
position.bottom = 10;
position.top = "inherit";
}
// outside left
if (position.left < containerLeft) {
position.left = containerLeft + 10;
position.right = "inherit";
}
// outside top
if (position.top < containerTop) {
position.top = 10;
position.bottom = "inherit";
}
el.css(position);
}