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

Fix timegrid column header clicks did not add a new full-day event

Browse Source
This commit is contained in:
Nathan Gray 2016-04-06 14:56:03 +00:00
parent 95ea446e7b
commit 47de53e086
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/js/et2_widget_daycol.js
View File

@ -998,12 +998,7 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
click: function(_ev) click: function(_ev)
{ {
// Click on the title // Click on the title
if(this.title.is(_ev.target) || this.title.has(_ev.target)) if ($j(_ev.target).hasClass('calendar_calAddEvent') && !_ev.target.dataset.whole_day)
{
app.calendar.update_state({view: 'day',date: this.date.toJSON()});
return false;
}
else if ($j(_ev.target).hasClass('calendar_calAddEvent') && !_ev.target.dataset.whole_day)
{ {
// Default handler to open a new event at the selected time // Default handler to open a new event at the selected time
var options = { var options = {
@ -1018,6 +1013,12 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
this.egw().open(null, 'calendar', 'add', options, '_blank'); this.egw().open(null, 'calendar', 'add', options, '_blank');
return false; return false;
} }
// Day label
else if(this.title.is(_ev.target) || this.title.has(_ev.target))
{
app.calendar.update_state({view: 'day',date: this.date.toJSON()});
return false;
}
// Header, but not the hidden event indicators that are in there // Header, but not the hidden event indicators that are in there
else if (this.header.has(_ev.target).length && !$j('.hiddenEventBefore',this.header).has(_ev.target).length || else if (this.header.has(_ev.target).length && !$j('.hiddenEventBefore',this.header).has(_ev.target).length ||
this.header.is(_ev.target) this.header.is(_ev.target)