diff --git a/UI/Scheduler/UIxCalMonthView.m b/UI/Scheduler/UIxCalMonthView.m index 508ee11c4..1108ff276 100644 --- a/UI/Scheduler/UIxCalMonthView.m +++ b/UI/Scheduler/UIxCalMonthView.m @@ -160,11 +160,13 @@ return [self _dateQueryParametersWithOffset: 2]; } -- (NSString *) _monthNameWithOffsetFromThisMonth: (int) offset +- (NSString *) _monthNameWithOffsetFromThisMonth: (int) monthsOffset { - NSCalendarDate *date; + NSCalendarDate *date, *firstDay; - date = [[self selectedDate] dateByAddingYears: 0 months: offset days: 0]; + firstDay = [[self selectedDate] firstDayOfMonth]; + date = [firstDay dateByAddingYears: 0 months: monthsOffset + days: 0 hours: 0 minutes: 0 seconds: 0]; return [self localizedNameForMonthOfYear: [date monthOfYear]]; } diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index b4026a14b..325f06b03 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -552,7 +552,8 @@ DIV.monthView DIV.day border-left: 2px solid #ccc; border-top: 2px solid #ccc; min-height: 4em; - overflow: auto; } + overflow: auto; + overflow-x: hidden; } DIV.selectedDay, DIV.selectedDay DIV.dayHeader diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 4c1f2a243..f09b2f5ae 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -785,8 +785,7 @@ function scrollDayView(scrollEvent) { function onClickableCellsDblClick(event) { newEvent(this, 'event'); - event.cancelBubble = true; - event.returnValue = false; + Event.stop(event); } function refreshCalendarEvents(scrollEvent) { @@ -1026,6 +1025,8 @@ function calendarDisplayCallback(http) { for (var i = 0; i < days.length; i++) { days[i].observe("click", onCalendarSelectDay); days[i].observe("dblclick", onClickableCellsDblClick); + days[i].observe("selectstart", listRowMouseDownHandler); + //days[i].down(".dayHeader").observe("selectstart", listRowMouseDownHandler); } else { var headerDivs = $("calendarHeader").childNodesWithTag("div");