extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 09:42:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix very small drags did not open add dialog

Browse Source
This commit is contained in:
nathan 2023-06-14 11:20:41 -06:00
parent 37bfeeaa16
commit b8b5601b48
1 changed files with 50 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
calendar/js/et2_widget_view.ts
View File

@ -602,20 +602,20 @@ export class et2_calendar_view extends et2_valueWidget
*/ */
_drag_create_end(end?) _drag_create_end(end?)
{ {
this.div.css('cursor',''); this.div.css('cursor', '');
if(typeof end === 'undefined') if(typeof end === 'undefined')
{ {
end = {}; end = {};
} }
let options = {};
let return_value = true;
if(this.drag_create.start && end.date && if(this.drag_create.start && end.date &&
JSON.stringify(this.drag_create.start.date) !== JSON.stringify(end.date)) JSON.stringify(this.drag_create.start.date) !== JSON.stringify(end.date))
{ {
// Drag from start to end, open dialog // Drag from start to end, open dialog
var options = { options['start'] = this.drag_create.start.date < end.date ? this.drag_create.start.date : end.date;
start: this.drag_create.start.date < end.date ? this.drag_create.start.date : end.date, options['end'] = this.drag_create.start.date < end.date ? end.date : this.drag_create.start.date;
end: this.drag_create.start.date < end.date ? end.date : this.drag_create.start.date
};
// Whole day needs to go from 00:00 to 23:59 // Whole day needs to go from 00:00 to 23:59
if(end.whole_day || this.drag_create.start.whole_day) if(end.whole_day || this.drag_create.start.whole_day)
@ -632,59 +632,55 @@ export class et2_calendar_view extends et2_valueWidget
} }
// Add anything else that was set, but not date // Add anything else that was set, but not date
jQuery.extend(options,this.drag_create.start, end); jQuery.extend(options, this.drag_create.start, end);
delete(options.date); delete (options.date);
return_value = false;
// Make sure parent is set, if needed
let app_calendar = this.getInstanceManager().app_obj.calendar || app.calendar;
if (this.drag_create.parent && this.drag_create.parent.options.owner !== app_calendar.state.owner && !options.owner)
{
options.owner = this.drag_create.parent.options.owner;
}
// Remove empties
for(var key in options)
{
if(!options[key])
{
delete options[key];
}
if(options[key] instanceof Date)
{
options[key] = options[key].toJSON();
}
}
app.calendar.add(options, this.drag_create.event);
// Wait a bit, having these stops the click
window.setTimeout(jQuery.proxy(function() {
this.drag_create.start = null;
this.drag_create.end = null;
this.drag_create.parent = null;
if(this.drag_create.event)
{
this.drag_create.event = null;
}
},this),100);
return false;
} }
this.drag_create.start = null; // Make sure parent is set, if needed
this.drag_create.end = null; let app_calendar = this.getInstanceManager().app_obj.calendar || app.calendar;
this.drag_create.parent = null; if(this.drag_create.parent && this.drag_create.parent.options.owner !== app_calendar.state.owner && !options.owner)
if(this.drag_create.event)
{ {
try options.owner = this.drag_create.parent.options.owner;
{
if(this.drag_create.event.destroy)
{
this.drag_create.event.destroy();
}
} catch(e) {}
this.drag_create.event = null;
} }
return true;
// Remove empties
for(var key in options)
{
if(!options[key])
{
delete options[key];
}
if(options[key] instanceof Date)
{
options[key] = options[key].toJSON();
}
}
app.calendar.add(options, this.drag_create.event);
// Wait a bit, having these stops the click
window.setTimeout(() =>
{
this.drag_create.start = null;
this.drag_create.end = null;
this.drag_create.parent = null;
if(this.drag_create.event)
{
try
{
if(this.drag_create.event.destroy)
{
this.drag_create.event.destroy();
}
}
catch(e)
{
}
this.drag_create.event = null;
}
}, 100);
return return_value;
} }
/** /**