extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 00:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed problem with event stacks for non drag-droppable event objects

Browse Source
This commit is contained in:
Ralf Becker 2011-02-14 12:07:39 +00:00
parent 807f447cb1
commit 1c79b04877
1 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -1498,20 +1498,15 @@ function open_edit(series)
$z_index = is_null($z_index) ? 20 : (int)$z_index; $z_index = is_null($z_index) ? 20 : (int)$z_index;
$html = $indent.'<div id="'.$draggableID.'" class="calEvent'.($is_private ? 'Private' : '').' '.$status_class.
'" style="'.$style.' border-color: '.$headerbgcolor.'; background: '.$background.'; z-index: '.$z_index.';"'.
$popup.' '.html::tooltip($tooltip,False,$ttip_options).
'>'."\n".$ie_fix.$html."\n".
$indent."</div>"."\n";
// ATM we do not support whole day events or recurring events for dragdrop // ATM we do not support whole day events or recurring events for dragdrop
$dd_emulation = "";
if (is_object($this->dragdrop) && if (is_object($this->dragdrop) &&
$this->use_time_grid && $this->use_time_grid &&
(int)$event['id'] && $this->bo->check_perms(EGW_ACL_EDIT,$event) && (int)$event['id'] && $this->bo->check_perms(EGW_ACL_EDIT,$event))
!$event['whole_day_on_top'] && {
if (!$event['whole_day_on_top'] &&
!$event['whole_day'] && !$event['whole_day'] &&
!$event['recur_type'] !$event['recur_type'])
)
{ {
// register event as draggable // register event as draggable
$this->dragdrop->addDraggable( $this->dragdrop->addDraggable(
@ -1528,6 +1523,21 @@ function open_edit(series)
'top center 2' 'top center 2'
); );
} }
else
{
// If a event isn't drag-dropable, the drag drop event handling has to be fully disabled
// for that object. Clicking on it - however - should still bring it to the foreground.
$dd_emulation = ' onmousedown="dd.z++; this.style.zIndex = dd.z; event.cancelBubble=true;"'
.'onmouseup="event.cancelBubble=true;"'
.'onmousemove="event.cancelBubble=true;"';
}
}
$html = $indent.'<div id="'.$draggableID.'" class="calEvent'.($is_private ? 'Private' : '').' '.$status_class.
'" style="'.$style.' border-color: '.$headerbgcolor.'; background: '.$background.'; z-index: '.$z_index.';"'.
$popup.' '.html::tooltip($tooltip,False,$ttip_options).
$dd_emulation.'>'.$prefix_icon."\n".$ie_fix.$html."\n".
$indent."</div>"."\n";
return $html; return $html;
} }