LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge of '6fa4b48fbe28f1cf7fd69a18c2504d3ac7c2e806' 

and '861e1c5552eaa1edddf6ca6869c53e708cf1c4d2'

Monotone-Parent: 6fa4b48fbe28f1cf7fd69a18c2504d3ac7c2e806
Monotone-Parent: 861e1c5552eaa1edddf6ca6869c53e708cf1c4d2
Monotone-Revision: e5138baadcbf7f196e37747707b570897665a6d3

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-03-31T20:22:11
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2010-03-31 20:22:11 +00:00
parent b26a51234c c83872d82b
commit 4ae82de32f
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
UI/WebServerResources/SchedulerUI.js
View File

@ -1279,6 +1279,7 @@ function newBaseEventDIV(eventRep, event, eventText) {
textDiv.update(eventText.replace(/(\\r)?\\n/g, "<BR/>"));
if (event[2] == null) {
// Status field is not defined -- user can't read event
eventCell.observe("selectstart", listRowMouseDownHandler);
eventCell.observe("click", onCalendarSelectEvent);
eventCell.observe("dblclick", Event.stop);
@ -1480,9 +1481,6 @@ function calendarDisplayCallback(http) {
observer = $("monthDaysView");
}
initMenu($("currentViewMenu"), menu);
observer.observe("contextmenu", onMenuCurrentView);
var contentView;
if (currentView == "monthview")
contentView = $("calendarContent");
@ -1490,9 +1488,24 @@ function calendarDisplayCallback(http) {
contentView = $("daysView");
contentView.observe("scroll", onBodyClickHandler);
attachDragControllers($("calendarHeader"));
// Create a clone of the contextual menu for the all-day
// events area
var allDayViewMenu = Element.clone($("currentViewMenu"), true);
allDayViewMenu.id = "allDayViewMenu";
var newEventMenuItem = allDayViewMenu.select("LI").first();
newEventMenuItem.writeAttribute("hour", "allday");
$("currentViewMenu").parentNode.appendChild(allDayViewMenu);
initMenu($("allDayViewMenu"), menu);
var allDayArea = $$("DIV#calendarHeader DIV.days").first();
allDayArea.observe("contextmenu", onMenuAllDayView);
}
attachDragControllers(contentView);
// Attach contextual menu
initMenu($("currentViewMenu"), menu);
observer.observe("contextmenu", onMenuCurrentView);
restoreSelectedDay();
refreshCalendarEvents(http.callbackData.scrollEvent);
@ -2087,6 +2100,11 @@ function onMenuCurrentView(event) {
popupMenu(event, 'currentViewMenu', this);
}
function onMenuAllDayView(event) {
$("eventDialog").hide();
popupMenu(event, 'allDayViewMenu', this);
}
function configureDragHandles() {
var handle = $("verticalDragHandle");
if (handle) {