Fix for bug #469.

See ChangeLog.

Monotone-Parent: 1f0e6aa5d222f124f1b91efcb5a68009fa584386
Monotone-Revision: 39447fbdf1de4d7eee3f87ded919230e8afb9bb2

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-03-31T15:27:59
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2010-03-31 15:27:59 +00:00
parent 81049065b9
commit cc9a0b8aba
3 changed files with 12 additions and 4 deletions

View File

@@ -1,3 +1,8 @@
2010-03-31 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/SchedulerUIDnD.js (onDragStart): don't
start the dragging when the target element has a scrollbar.
2010-03-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Contacts/SOGoContactSourceFolder.m

View File

@@ -1099,9 +1099,11 @@ function scrollDayView(scrollEvent) {
}
function onClickableCellsDblClick(event) {
newEventFromWidget(this, 'event');
Event.stop(event);
var target = getTarget(event);
if (target.hasClassName("dayHeader") || this.clientHeight >= this.scrollHeight) {
newEventFromWidget(this, 'event');
Event.stop(event);
}
}
function refreshCalendarEvents(scrollEvent) {

View File

@@ -980,7 +980,8 @@ SOGoEventDragController.prototype = {
if (target.nodeType == 1) {
if ((!this.eventCells
&& (target.hasClassName("clickableHourCell")
|| target.hasClassName("day")))
|| target.hasClassName("day"))
&& (target.clientHeight >= target.scrollHeight))
|| (this.eventCells && this.eventCells[0].editable
&& !this.eventIsInvitation)) {
var utilities = SOGoEventDragUtilities();