deac/fullcalendar
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'althaus/devel'

Browse source
This commit is contained in:
Wojciech Zylinski 2012-01-08 03:29:21 +00:00
parent 572741f5f0 afd38c48df
commit 96e6978923
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/basic/BasicView.js
View file

@ -212,6 +212,7 @@ function BasicView(element, calendar, viewName) {
cell.removeClass(tm + '-state-highlight fc-today'); cell.removeClass(tm + '-state-highlight fc-today');
} }
cell.find('div.fc-day-number').text(date.getDate()); cell.find('div.fc-day-number').text(date.getDate());
trigger('dayRender', t, date, cell);
if (dowDirty) { if (dowDirty) {
setDayID(cell, date); setDayID(cell, date);
} }

30
src/common/View.js
View file

@ -106,6 +106,18 @@ function View(element, calendar, viewName) {
} }
// returns all events with a matching propery value
function eventsByProp(property, value)
{
var id, i, len, events = [];
for(id in eventsByID)
for(i=0, len=eventsByID[id].length; i<len; i++)
if (eventsByID[id][i][property] == value)
events.push(eventsByID[id][i]);
return events;
}
/* Event Elements /* Event Elements
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -179,7 +191,12 @@ function View(element, calendar, viewName) {
function eventDrop(e, event, dayDelta, minuteDelta, allDay, ev, ui) { function eventDrop(e, event, dayDelta, minuteDelta, allDay, ev, ui) {
var oldAllDay = event.allDay; var oldAllDay = event.allDay;
var eventId = event._id; var eventId = event._id;
moveEvents(eventsByID[eventId], dayDelta, minuteDelta, allDay); var prop = opt('eventGroupProperty') || 'id';
if (prop != 'id')
events = eventsByProp(prop, event[prop]);
else
events = eventsByID[eventId];
moveEvents(events, dayDelta, minuteDelta, allDay);
trigger( trigger(
'eventDrop', 'eventDrop',
e, e,
@ -189,7 +206,7 @@ function View(element, calendar, viewName) {
allDay, allDay,
function() { function() {
// TODO: investigate cases where this inverse technique might not work // TODO: investigate cases where this inverse technique might not work
moveEvents(eventsByID[eventId], -dayDelta, -minuteDelta, oldAllDay); moveEvents(events, -dayDelta, -minuteDelta, oldAllDay);
reportEventChange(eventId); reportEventChange(eventId);
}, },
ev, ev,
@ -201,7 +218,12 @@ function View(element, calendar, viewName) {
function eventResize(e, event, dayDelta, minuteDelta, ev, ui) { function eventResize(e, event, dayDelta, minuteDelta, ev, ui) {
var eventId = event._id; var eventId = event._id;
elongateEvents(eventsByID[eventId], dayDelta, minuteDelta); var prop = opt('eventGroupProperty') || 'id';
if (prop != 'id')
events = eventsByProp(prop, event[prop]);
else
events = eventsByID[eventId];
elongateEvents(events, dayDelta, minuteDelta);
trigger( trigger(
'eventResize', 'eventResize',
e, e,
@ -210,7 +232,7 @@ function View(element, calendar, viewName) {
minuteDelta, minuteDelta,
function() { function() {
// TODO: investigate cases where this inverse technique might not work // TODO: investigate cases where this inverse technique might not work
elongateEvents(eventsByID[eventId], -dayDelta, -minuteDelta); elongateEvents(events, -dayDelta, -minuteDelta);
reportEventChange(eventId); reportEventChange(eventId);
}, },
ev, ev,