extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:18:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix week view with multiple users (non-consolidated) still had some space where the user could click on the day header, which was recogized as a header click instead of an all day non-blocking click

Browse Source
This commit is contained in:
nathangray 2016-07-25 11:22:32 -06:00
parent 00eacc6791
commit 92c8493eb8
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
calendar/js/et2_widget_daycol.js
View File

@ -1081,16 +1081,21 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
}
// Header, all day non-blocking
else if (this.header.has(_ev.target).length && !jQuery('.hiddenEventBefore',this.header).has(_ev.target).length ||
this.header.is(_ev.target)
this.header.is(_ev.target)
)
{
// Click on the header, but not the title. That's an all-day non-blocking
var end = this.date.getFullYear() + '-' + (this.date.getUTCMonth()+1) + '-' + this.date.getUTCDate() + 'T23:59';
this.egw().open(null, 'calendar', 'add', {
var options = {
start: this.date.toJSON(),
end: end,
non_blocking: true
} , '_blank');
}
if (this.options.owner != app.calendar.state.owner)
{
options.owner = this.options.owner;
}
this.egw().open(null, 'calendar', 'add', options, '_blank');
return false;
}
}

11
calendar/js/et2_widget_timegrid.js
View File

@ -1864,6 +1864,8 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
*/
_mouse_down: function(event)
{
if(event.which !== 1) return;
var start = jQuery.extend({},this.gridHover[0].dataset);
if(start.date)
{
@ -1993,6 +1995,10 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
for(var id in this.gridHover[0].dataset) {
delete this.gridHover[0].dataset[id];
}
if(this.options.granularity == 0)
{
this.gridHover.css('height','');
}
while(node && node != this.node && node.tagName != 'BODY' && path.length < 10)
{
path.push(node);
@ -2006,7 +2012,10 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
position: 'absolute',
top: '',
bottom: '0px',
height: $node.css('padding-bottom')
// Use 100% height if we're hiding the day labels to avoid
// any remaining space from the hidden labels
height: $node.height() > parseInt($node.css('line-height')) ?
$node.css('padding-bottom') : '100%'
});
day = node;
this.gridHover