holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix clicking all day non-blocking section under day title went to day view instead of creating a new event

Browse Source
This commit is contained in:
Nathan Gray 2016-04-11 14:37:04 +00:00
parent a6a3dc5250
commit 0b09f5e31e
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
calendar/js/et2_widget_daycol.js
View File

@ -998,7 +998,9 @@ 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 ($j(_ev.target).hasClass('calendar_calAddEvent') && !_ev.target.dataset.whole_day) if ($j(_ev.target).hasClass('calendar_calAddEvent'))
{
if(!_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 = {
@ -1013,13 +1015,7 @@ 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 // Header, all day non-blocking
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
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)
) )
@ -1033,6 +1029,14 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
} , '_blank'); } , '_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;
}
}, },
/** /**