From 661d3f28099e34833fe4a29f48b577888bd3ad99 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Sun, 16 May 2010 19:24:07 +0000 Subject: [PATCH] See ChangeLog. Monotone-Parent: 28ba6a8fb0de57f2cd4f4b6c185e5b0303c886ec Monotone-Revision: 0891f9bac2704aa4c0ef0224c54360af14c5618a Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-05-16T19:24:07 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ UI/WebServerResources/SchedulerUI.css | 3 ++- UI/WebServerResources/SchedulerUI.js | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4cd994e8f..975dfb045 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-05-21 Francis Lachapelle + * UI/WebServerResources/SchedulerUI.js (onMenuCurrentView): + propagate the click event when right-clicking on an event. + * UI/WebServerResources/UIxPreferences.js (endEditable, onColorPickerChoice): those functions will automatically trigger the reload of the current module (hasChanged is set to 1). diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index 233f1bbd7..bf8dd23ee 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -146,7 +146,8 @@ DIV#calendarView bottom: 0px; width: 100%; border-top: 1px solid #aaa; - border-left: 1px solid #aaa; } + border-left: 1px solid #aaa; + -khtml-user-select: none; } DIV#calendarView A { text-decoration: none; diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index a44eabc7c..3640574b6 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -1342,6 +1342,8 @@ function newBaseEventDIV(eventRep, event, eventText) { } innerDiv.addClassName(categoryStyle); } + eventCell.observe("contextmenu", onMenuCurrentView); + if (event[2] == null) { // Status field is not defined -- user can't read event eventCell.observe("selectstart", listRowMouseDownHandler); @@ -2169,7 +2171,10 @@ function onMenuSharing(event) { function onMenuCurrentView(event) { $("eventDialog").hide(); + var onClick = onCalendarSelectEvent.bind(this); + onClick(event); popupMenu(event, 'currentViewMenu', this); + } function onMenuAllDayView(event) {