wassname/fullcalendar
1
0
Fork 0
mirror of https://github.com/wassname/fullcalendar.git synced 2026-09-09 11:22:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for issue 10 - drag event to another resource

Browse Source
This commit is contained in:
sean kenny
2014-04-09 15:45:59 +01:00
parent fb1a44e083
commit 099351a0b5
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/out/fullcalendar.js
+12 -7
View File
@@ -5958,6 +5958,7 @@ function ResourceEventRenderer() {
var isAllDay, prevIsAllDay;
var colDelta, prevColDelta;
var dayDelta; // derived from colDelta
var resourceDelta; // derived from colDelta
var minuteDelta, prevMinuteDelta;
eventElement.draggable({
@@ -5980,6 +5981,7 @@ function ResourceEventRenderer() {
isAllDay = prevIsAllDay = getIsCellAllDay(origCell);
colDelta = prevColDelta = 0;
dayDelta = 0;
resourceDelta = 0;
minuteDelta = prevMinuteDelta = 0;
},
@@ -6002,12 +6004,13 @@ function ResourceEventRenderer() {
colDelta = Math.round((ui.position.left - origPosition.left) / colWidth);
if (colDelta != prevColDelta) {
// calculate the day delta based off of the original clicked column and the column delta
var origDate = cellToDate(0, origCell.col);
var col = origCell.col + colDelta;
col = Math.max(0, col);
col = Math.min(colCnt-1, col);
var date = cellToDate(0, col);
dayDelta = dayDiff(date, origDate);
//var origDate = cellToDate(0, origCell.col);
//var col = origCell.col + colDelta;
//col = Math.max(0, col);
//col = Math.min(colCnt-1, col);
//var date = cellToDate(0, col);
//dayDelta = 0; //dayDiff(date, origDate);
resourceDelta = colDelta;
}
// calculate minute delta (only if over slots)
@@ -6042,7 +6045,9 @@ function ResourceEventRenderer() {
clearOverlays();
trigger('eventDragStop', eventElement, event, ev, ui);
if (isInBounds && (isAllDay || dayDelta || minuteDelta)) { // changed!
//if (isInBounds && (isAllDay || dayDelta || minuteDelta)) { // changed!
if (isInBounds && (isAllDay || resourceDelta || minuteDelta)) { // changed!
event.resources = resources[origCell.col + resourceDelta].id;
eventDrop(this, event, dayDelta, isAllDay ? 0 : minuteDelta, isAllDay, ev, ui);
}
else { // either no change or out-of-bounds (draggable has already reverted)
build/out/fullcalendar.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
src/resource/ResourceEventRenderer.js
+12 -7
View File
@@ -497,6 +497,7 @@ function ResourceEventRenderer() {
var isAllDay, prevIsAllDay;
var colDelta, prevColDelta;
var dayDelta; // derived from colDelta
var resourceDelta; // derived from colDelta
var minuteDelta, prevMinuteDelta;
eventElement.draggable({
@@ -519,6 +520,7 @@ function ResourceEventRenderer() {
isAllDay = prevIsAllDay = getIsCellAllDay(origCell);
colDelta = prevColDelta = 0;
dayDelta = 0;
resourceDelta = 0;
minuteDelta = prevMinuteDelta = 0;
},
@@ -541,12 +543,13 @@ function ResourceEventRenderer() {
colDelta = Math.round((ui.position.left - origPosition.left) / colWidth);
if (colDelta != prevColDelta) {
// calculate the day delta based off of the original clicked column and the column delta
var origDate = cellToDate(0, origCell.col);
var col = origCell.col + colDelta;
col = Math.max(0, col);
col = Math.min(colCnt-1, col);
var date = cellToDate(0, col);
dayDelta = dayDiff(date, origDate);
//var origDate = cellToDate(0, origCell.col);
//var col = origCell.col + colDelta;
//col = Math.max(0, col);
//col = Math.min(colCnt-1, col);
//var date = cellToDate(0, col);
//dayDelta = 0; //dayDiff(date, origDate);
resourceDelta = colDelta;
}
// calculate minute delta (only if over slots)
@@ -581,7 +584,9 @@ function ResourceEventRenderer() {
clearOverlays();
trigger('eventDragStop', eventElement, event, ev, ui);
if (isInBounds && (isAllDay || dayDelta || minuteDelta)) { // changed!
//if (isInBounds && (isAllDay || dayDelta || minuteDelta)) { // changed!
if (isInBounds && (isAllDay || resourceDelta || minuteDelta)) { // changed!
event.resources = resources[origCell.col + resourceDelta].id;
eventDrop(this, event, dayDelta, isAllDay ? 0 : minuteDelta, isAllDay, ev, ui);
}
else { // either no change or out-of-bounds (draggable has already reverted)