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

Fix for drag/drop and resize revert

Browse Source
This commit is contained in:
Sean Kenny
2014-08-30 09:32:18 +01:00
parent 4d489a41ea
commit ea7458aae4
6 changed files with 256 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resource/ResourceEventRenderer.js
+7 -7
View File
@@ -25,7 +25,7 @@ function ResourceEventRenderer() {
var colContentLeft = t.colContentLeft;
var colContentRight = t.colContentRight;
var cellToDate = t.cellToDate;
var getColCnt = function() { return resources().length; };
var getColCnt = function() { return getResources().length; };
var getColWidth = t.getColWidth;
var getSnapHeight = t.getSnapHeight;
var getSnapDuration = t.getSnapDuration;
@@ -45,7 +45,7 @@ function ResourceEventRenderer() {
var calendar = t.calendar;
var formatDate = calendar.formatDate;
var getEventEnd = calendar.getEventEnd;
var resources = t.getResources;
var getResources = t.getResources;
// overrides
@@ -96,7 +96,7 @@ function ResourceEventRenderer() {
for (i=0; i<colCnt; i++) {
cellDate = cellToDate(0, 0); // updated - should show same day for all
var resourceEvents = eventsForResource(resources()[i], events);
var resourceEvents = eventsForResource(getResources()[i], events);
colSegs = sliceSegs(
resourceEvents,
cellDate.clone().time(minTime),
@@ -492,9 +492,9 @@ function ResourceEventRenderer() {
// if (newCol !== origCol){
// event.resources = [ resources()[newCol].id ];
// }
var newResources = event.resources;
var resources = event.resources;
if (newCol !== origCol){
newResources = [ resources()[newCol].id ];
resources = [ getResources()[newCol].id ];
}
var eventStart = event.start.clone(); // already assumed to have a stripped time
@@ -509,7 +509,7 @@ function ResourceEventRenderer() {
eventDrop(
eventElement[0],
event,
newResources,
resources,
eventStart,
ev,
ui
@@ -645,7 +645,7 @@ function ResourceEventRenderer() {
if (isInBounds && (isAllDay || resourceDelta || snapDelta)) { // changed!
var resources = event.resources;
if (resourceDelta){
resources = [ resources()[origCell.col + resourceDelta].id ];
resources = [ getResources()[origCell.col + resourceDelta].id ];
}
eventDrop(
eventElement[0],
src/resource/ResourceView.js
+3 -5
View File
@@ -62,12 +62,12 @@ function ResourceView(element, calendar, viewName) {
t.dragStart = dragStart;
t.dragStop = dragStop;
t.getResources = calendar.fetchResources;
// imports
View.call(t, element, calendar, viewName);
t.eventDrop = eventDrop;
t.eventResize = eventResize;
// imports
// View.call(t, element, calendar, viewName);
OverlayManager.call(t);
SelectionManager.call(t);
ResourceEventRenderer.call(t);
@@ -77,7 +77,6 @@ function ResourceView(element, calendar, viewName) {
var clearOverlays = t.clearOverlays;
var reportSelection = t.reportSelection;
var unselect = t.unselect;
//var daySelectionMousedown = t.daySelectionMousedown;
var slotSegHtml = t.slotSegHtml;
var cellToDate = t.cellToDate;
var dateToCell = t.dateToCell;
@@ -916,7 +915,6 @@ function ResourceView(element, calendar, viewName) {
function eventDrop(el, event, newResources, newStart, ev, ui) {
//var mutateResult = calendar.mutateEvent(event, newStart, null);
var mutateResult = calendar.mutateResourceEvent(event, newResources, newStart, null);
trigger(
@@ -937,7 +935,7 @@ function ResourceView(element, calendar, viewName) {
function eventResize(el, event, newEnd, ev, ui) {
var mutateResult = calendar.mutateResourceEvent(event, null, newEnd);
var mutateResult = calendar.mutateResourceEvent(event, event.resources, null, newEnd);
trigger(
'eventResize',