From 16a1b02826de53a95a47ea7e05ba3e5f94a69dfd Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 8 Oct 2012 16:31:17 -0400 Subject: [PATCH] Fixed position of event info box in day view Fixes #2011 --- UI/WebServerResources/SchedulerUI.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 08f877af8..1d5980cdf 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -699,8 +699,9 @@ function onViewEventCallback(http) { var cellDimensions = cell.getDimensions(); var div = $("eventDialog"); var divDimensions = div.getDimensions(); + var viewPosition = $("calendarView").cumulativeOffset(); var view; - var left = cellPosition[0]; + var left; var top = cellPosition[1] - 5; if (currentView != "monthview") { @@ -722,14 +723,13 @@ function onViewEventCallback(http) { top -= cell.up("DIV.day").scrollTop; } - if (left > parseInt(window.width()*0.75)) { - left = left - divDimensions["width"] + 10; + left = cellPosition[0] + cellDimensions["width"] - parseInt(cellDimensions["width"]/3); + if (left + divDimensions["width"] > window.width()) { + left = cellPosition[0] - divDimensions["width"] + 10; div.removeClassName("left"); div.addClassName("right"); } else { - //log (" left = " + left + " + " + cellDimensions.width + " - " + parseInt(cellDimensions["width"]/3)); - left = left + cellDimensions["width"] - parseInt(cellDimensions["width"]/3); div.removeClassName("right"); div.addClassName("left"); }