wassname/fullcalendar
1
0
Fork 0
mirror of https://github.com/wassname/fullcalendar.git synced 2026-06-27 16:10:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug with dragging timed events from popover

Browse Source
This commit is contained in:
Adam Shaw
2014-08-22 13:04:02 -07:00
parent b88fd6d0cd
commit 157152f7d0
2 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/DayGrid.limit.js
+5 -1
View File
@@ -283,7 +283,11 @@ $.extend(DayGrid.prototype, {
this.popoverSegs = segs;
for (i = 0; i < segs.length; i++) {
segs[i].isDetached = true; // signals the segment doesn't live in a cell. needed for event DnD
// because segments in the popover are not part of a grid coordinate system, provide a hint to any
// grids that want to do drag-n-drop about which cell it came from
segs[i].cellDate = date;
segContainer.append(segs[i].el);
}
src/common/Grid.events.js
+8 -20
View File
@@ -198,7 +198,8 @@ $.extend(Grid.prototype, {
view.trigger('eventDragStart', el[0], event, ev, {}); // last argument is jqui dummy
},
cellOver: function(cell, date) {
var res = _this.computeDraggedEventDates(seg, dragListener.origDate, date);
var origDate = seg.cellDate || dragListener.origDate;
var res = _this.computeDraggedEventDates(seg, origDate, date);
newStart = res.start;
newEnd = res.end;
@@ -238,9 +239,8 @@ $.extend(Grid.prototype, {
},
// Given a segment, where it originally resided on the grid, and the new date it has been dragged to,
// calculates the Event Object's new start and end dates.
computeDraggedEventDates: function(seg, origDate, newDate) {
// Given a segment, the dates where a drag began and ended, calculates the Event Object's new start and end dates
computeDraggedEventDates: function(seg, dragStartDate, dropDate) {
var view = this.view;
var event = seg.event;
var start = event.start;
@@ -249,21 +249,8 @@ $.extend(Grid.prototype, {
var newStart;
var newEnd;
// the segment might be explicitly marked as not-in-the-grid
if (seg.isDetached) {
origDate = null;
}
// compute the delta.
// if the original date of the drag is available, use that.
// otherwise, use the event start, which will cause the event's start to become identical to newDate.
// if switching from day <-> timed, start should be reset to the dropped date, and the end cleared (done later)
if (newDate.hasTime() === (origDate || start).hasTime()) {
delta = dayishDiff(newDate, (origDate || start));
}
// recalculate start/end
if (delta) {
if (dropDate.hasTime() === dragStartDate.hasTime()) {
delta = dayishDiff(dropDate, dragStartDate);
newStart = start.clone().add(delta);
if (event.end === null) { // do we need to compute an end?
newEnd = null;
@@ -273,7 +260,8 @@ $.extend(Grid.prototype, {
}
}
else {
newStart = newDate;
// if switching from day <-> timed, start should be reset to the dropped date, and the end cleared
newStart = dropDate;
newEnd = null; // end should be cleared
}