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

Enable planner view vertical time bar and clicks for extra space after last planner row

Browse Source
This commit is contained in:
nathangray 2016-08-15 09:32:06 -06:00
parent 55c0122155
commit d2d7c6f255
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
calendar/js/et2_widget_planner.js
View File

@ -249,8 +249,8 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
});
})
.on('mousemove', function(event) {
// Not when over header
if(jQuery(event.target).closest('.calendar_eventRows').length == 0)
// Ignore headers
if(planner.headers.has(event.target).length !== 0)
{
planner.vertical_bar.hide();
return;
@ -264,7 +264,12 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
planner.vertical_bar.css('top','0px');
// Get time at mouse
if(planner.options.group_by == 'month')
if(jQuery(event.target).closest('.calendar_eventRows').length == 0)
{
// "Invalid" times, from space after the last planner row, or header
var time = planner._get_time_from_position(event.pageX - planner.grid.offset().left, 10);
}
else if(planner.options.group_by == 'month')
{
var time = planner._get_time_from_position(event.clientX, event.clientY);
}
@ -1954,7 +1959,12 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
{
// Clicked in row, but not on an event
// Default handler to open a new event at the selected time
if(this.options.group_by == 'month')
if(jQuery(event.target).closest('.calendar_eventRows').length == 0)
{
// "Invalid" times, from space after the last planner row, or header
var date = this._get_time_from_position(_ev.pageX - this.grid.offset().left, _ev.pageY - this.grid.offset().top);
}
else if(this.options.group_by == 'month')
{
var date = this._get_time_from_position(_ev.clientX, _ev.clientY);
}
@ -2070,7 +2080,9 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
{
break;
}
} while(row.nodeName !== 'BODY');
} while(row && row.nodeName !== 'BODY');
if(!row) return false;
// Restore hidden nodes
for(var i = 0; i < hidden_nodes.length; i++)
{
@ -2118,7 +2130,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
_mouse_down: function(event)
{
// Ignore headers
if(jQuery(event.target, this.headers).length !== 0) return false;
if(this.headers.has(event.target).length !== 0) return false;
// Get time at mouse
if(this.options.group_by === 'month')
@ -2131,8 +2143,6 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
}
if(!time) return false;
this.div.css('cursor', 'ew-resize');
// Find the correct row so we know the parent
var row = event.target.closest('.calendar_plannerRowWidget');
for(var i = 0; i < this._children.length && row; i++)
@ -2145,6 +2155,10 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
break;
}
}
if(!this.drag_create.parent) return false;
this.div.css('cursor', 'ew-resize');
return this._drag_create_start(jQuery.extend({},this.drag_create.parent.node.dataset,{date: time.toJSON()}));
},