extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Calendar: Fix very small drags did not open add dialog"

Browse Source 
It causes "extra" clicks on events (opens the event and the add dialog), missed clicks, events not opening when clicked

This reverts commit b8b5601b48.
This commit is contained in:
nathan 2023-06-15 08:09:30 -06:00
parent d1aa65a662
commit 694ea2d6f3
1 changed files with 47 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
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
options['start'] = this.drag_create.start.date < end.date ? this.drag_create.start.date : end.date; var options = {
options['end'] = this.drag_create.start.date < end.date ? end.date : this.drag_create.start.date; start: this.drag_create.start.date < end.date ? this.drag_create.start.date : end.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,14 +632,12 @@ 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 // Make sure parent is set, if needed
let app_calendar = this.getInstanceManager().app_obj.calendar || app.calendar; 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) 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; options.owner = this.drag_create.parent.options.owner;
} }
@ -659,8 +657,19 @@ export class et2_calendar_view extends et2_valueWidget
app.calendar.add(options, this.drag_create.event); app.calendar.add(options, this.drag_create.event);
// Wait a bit, having these stops the click // Wait a bit, having these stops the click
window.setTimeout(() => 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; this.drag_create.start = null;
this.drag_create.end = null; this.drag_create.end = null;
this.drag_create.parent = null; this.drag_create.parent = null;
@ -672,15 +681,10 @@ export class et2_calendar_view extends et2_valueWidget
{ {
this.drag_create.event.destroy(); this.drag_create.event.destroy();
} }
} } catch(e) {}
catch(e)
{
}
this.drag_create.event = null; this.drag_create.event = null;
} }
}, 100); return true;
return return_value;
} }
/** /**