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 for issue #36

Browse Source
This commit is contained in:
Sean Kenny
2014-09-28 13:06:27 +01:00
parent e4dd8d37ee
commit 7f478eb1b2
9 changed files with 78 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/cdnjs/2.0.2/fullcalendar.js
Vendored
+19 -7
View File
@@ -7001,7 +7001,7 @@ function ResourceEventRenderer() {
segs = [];
for (i=0; i<colCnt; i++) {
cellDate = cellToDate(0, 0); // updated - should show same day for all
cellDate = cellToDate(0, 0); // updated - should show same day for all
var resourceEvents = eventsForResource(getResources()[i], events);
colSegs = sliceSegs(
resourceEvents,
@@ -7549,14 +7549,26 @@ function ResourceEventRenderer() {
trigger('eventDragStop', eventElement[0], event, ev, ui);
if (isInBounds && (isAllDay || resourceDelta || snapDelta)) { // changed!
var resources = event.resources;
if (resourceDelta){
resources = [ getResources()[origCell.col + resourceDelta].id ];
}
if (resourceDelta){
// given we have r1/r3
// if we move r3 to r2, then we want to maintain r1/r2.
// if we move r3 to r1, then we only want to maintain r1 - so we splice the array
var resources = getResources();
var newId = resources[origCell.col + resourceDelta].id;
var oldId = resources[origCell.col].id;
var oldIndex = event.resources.indexOf(oldId);
var newIndex = event.resources.indexOf(newId);
if (newIndex > -1) {
event.resources.splice(oldIndex, 1);
} else {
event.resources[oldIndex] = newId;
}
}
eventDrop(
eventElement[0],
event,
resources,
event.resources,
eventStart,
ev,
ui
@@ -7604,7 +7616,7 @@ function ResourceEventRenderer() {
if (eventStart) { // must of had a state change
timeElement.text(
t.getEventTimeText(eventStart, event.end ? eventEnd : null)
// ^
//
// only display the new end if there was an old end
);
}
dist/cdnjs/2.0.2/fullcalendar.min.js
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
dist/cdnjs/2.0.2/lang-all.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
dist/fullcalendar-2.0.2.zip
Vendored
BIN
View File
Binary file not shown.
dist/fullcalendar.js
Vendored
+19 -7
View File
@@ -7001,7 +7001,7 @@ function ResourceEventRenderer() {
segs = [];
for (i=0; i<colCnt; i++) {
cellDate = cellToDate(0, 0); // updated - should show same day for all
cellDate = cellToDate(0, 0); // updated - should show same day for all
var resourceEvents = eventsForResource(getResources()[i], events);
colSegs = sliceSegs(
resourceEvents,
@@ -7549,14 +7549,26 @@ function ResourceEventRenderer() {
trigger('eventDragStop', eventElement[0], event, ev, ui);
if (isInBounds && (isAllDay || resourceDelta || snapDelta)) { // changed!
var resources = event.resources;
if (resourceDelta){
resources = [ getResources()[origCell.col + resourceDelta].id ];
}
if (resourceDelta){
// given we have r1/r3
// if we move r3 to r2, then we want to maintain r1/r2.
// if we move r3 to r1, then we only want to maintain r1 - so we splice the array
var resources = getResources();
var newId = resources[origCell.col + resourceDelta].id;
var oldId = resources[origCell.col].id;
var oldIndex = event.resources.indexOf(oldId);
var newIndex = event.resources.indexOf(newId);
if (newIndex > -1) {
event.resources.splice(oldIndex, 1);
} else {
event.resources[oldIndex] = newId;
}
}
eventDrop(
eventElement[0],
event,
resources,
event.resources,
eventStart,
ev,
ui
@@ -7604,7 +7616,7 @@ function ResourceEventRenderer() {
if (eventStart) { // must of had a state change
timeElement.text(
t.getEventTimeText(eventStart, event.end ? eventEnd : null)
// ^
//
// only display the new end if there was an old end
);
}
dist/fullcalendar.min.js
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
dist/lang-all.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
src/resource/ResourceEventRenderer.js
+19 -7
View File
@@ -95,7 +95,7 @@ function ResourceEventRenderer() {
segs = [];
for (i=0; i<colCnt; i++) {
cellDate = cellToDate(0, 0); // updated - should show same day for all
cellDate = cellToDate(0, 0); // updated - should show same day for all
var resourceEvents = eventsForResource(getResources()[i], events);
colSegs = sliceSegs(
resourceEvents,
@@ -643,14 +643,26 @@ function ResourceEventRenderer() {
trigger('eventDragStop', eventElement[0], event, ev, ui);
if (isInBounds && (isAllDay || resourceDelta || snapDelta)) { // changed!
var resources = event.resources;
if (resourceDelta){
resources = [ getResources()[origCell.col + resourceDelta].id ];
}
if (resourceDelta){
// given we have r1/r3
// if we move r3 to r2, then we want to maintain r1/r2.
// if we move r3 to r1, then we only want to maintain r1 - so we splice the array
var resources = getResources();
var newId = resources[origCell.col + resourceDelta].id;
var oldId = resources[origCell.col].id;
var oldIndex = event.resources.indexOf(oldId);
var newIndex = event.resources.indexOf(newId);
if (newIndex > -1) {
event.resources.splice(oldIndex, 1);
} else {
event.resources[oldIndex] = newId;
}
}
eventDrop(
eventElement[0],
event,
resources,
event.resources,
eventStart,
ev,
ui
@@ -698,7 +710,7 @@ function ResourceEventRenderer() {
if (eventStart) { // must of had a state change
timeElement.text(
t.getEventTimeText(eventStart, event.end ? eventEnd : null)
// ^
//
// only display the new end if there was an old end
);
}
tests/resourceDayView.html
+11
View File
@@ -110,6 +110,17 @@
eventResize: function (event, delta, revertFunc) {
//revertFunc();
},
buttonText: {
prev: '<<',
next: '>>',
prevYear: ' << ',
nextYear: ' >> ',
today: 'oggi',
month: 'mese',
week: 'settimana',
day: 'giorno2',
resourceDay: 'risorsa'
},
// weekends: false,
header: {
left: 'prev,next today',