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

Merge branch 'v1.4-speedup'

Browse source
This commit is contained in:
Adam Shaw 2010-01-26 18:56:11 -08:00
parent 5bc9ac2c97 f89e82da68
commit 7158fc3470
10 changed files with 7064 additions and 429 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

485
src/agenda.js
View file

@ -21,7 +21,7 @@ setDefaults({
views.agendaWeek = function(element, options) {
return new Agenda(element, options, {
render: function(date, delta, height, fetchEvents) {
render: function(date, delta, width, height, fetchEvents) {
if (delta) {
addDays(date, delta * 7);
}
@ -41,14 +41,19 @@ views.agendaWeek = function(element, options) {
this.option('titleFormat'),
options
);
this.renderAgenda(options.weekends ? 7 : 5, this.option('columnFormat'), height, fetchEvents);
this.renderAgenda(
options.weekends ? 7 : 5,
this.option('columnFormat'),
width, height,
fetchEvents
);
}
});
};
views.agendaDay = function(element, options) {
return new Agenda(element, options, {
render: function(date, delta, height, fetchEvents) {
render: function(date, delta, width, height, fetchEvents) {
if (delta) {
addDays(date, delta);
if (!options.weekends) {
@ -58,7 +63,12 @@ views.agendaDay = function(element, options) {
this.title = formatDate(date, this.option('titleFormat'), options);
this.start = this.visStart = cloneDate(date, true);
this.end = this.visEnd = addDays(cloneDate(this.start), 1);
this.renderAgenda(1, this.option('columnFormat'), height, fetchEvents);
this.renderAgenda(
1,
this.option('columnFormat'),
width, height,
fetchEvents
);
}
});
};
@ -68,18 +78,26 @@ function Agenda(element, options, methods) {
var head, body, bodyContent, bodyTable, bg,
colCnt,
axisWidth, colWidth, slotHeight,
cachedDaySegs=[], cachedSlotSegs=[],
cachedHeight,
viewWidth, viewHeight,
cachedEvents=[],
daySegmentContainer,
daySegments=[],
slotSegmentContainer,
slotSegments=[],
tm, firstDay,
nwe, // no weekends (int)
rtl, dis, dit, // day index sign / translate
minMinute, maxMinute,
colContentPositions = new HorizontalPositionCache(function(col) {
return bg.find('td:eq(' + col + ') div div');
}),
// ...
view = $.extend(this, viewMethods, methods, {
renderAgenda: renderAgenda,
renderEvents: renderEvents,
rerenderEvents: rerenderEvents,
clearEvents: clearEvents,
updateSize: updateSize,
shown: resetScroll,
defaultEventEnd: function(event) {
@ -88,21 +106,6 @@ function Agenda(element, options, methods) {
return start;
}
return addMinutes(start, options.defaultEventMinutes);
},
visEventEnd: function(event) {
if (event.allDay) {
if (event.end) {
var end = cloneDate(event.end);
return (event.allDay || end.getHours() || end.getMinutes()) ? addDays(end, 1) : end;
}else{
return addDays(cloneDate(event.start), 1);
}
}
if (event.end) {
return cloneDate(event.end);
}else{
return addMinutes(cloneDate(event.start), options.defaultEventMinutes);
}
}
});
view.init(element, options);
@ -118,7 +121,7 @@ function Agenda(element, options, methods) {
element.disableSelection();
}
function renderAgenda(c, colFormat, height, fetchEvents) {
function renderAgenda(c, colFormat, width, height, fetchEvents) {
colCnt = c;
// update option-derived variables
@ -175,6 +178,9 @@ function Agenda(element, options, methods) {
head = $(s).appendTo(element);
head.find('td').click(slotClick);
// all-day event container
daySegmentContainer = $("<div/>").appendTo(head);
// body
d = zeroDate();
var maxd = addMinutes(cloneDate(d), maxMinute);
@ -197,6 +203,9 @@ function Agenda(element, options, methods) {
.appendTo(element);
body.find('td').click(slotClick);
// slot event container
slotSegmentContainer = $("<div/>").appendTo(bodyContent);
// background stripes
d = cloneDate(d0);
s = "<div class='fc-agenda-bg' style='position:absolute;z-index:1'>" +
@ -218,7 +227,7 @@ function Agenda(element, options, methods) {
}else{ // skeleton already built, just modify it
view.clearEvents();
clearEvents();
// redo column header text and class
head.find('tr:first th').slice(1, -1).each(function() {
@ -253,7 +262,7 @@ function Agenda(element, options, methods) {
}
updateSize(height);
updateSize(width, height);
resetScroll();
fetchEvents(renderEvents);
@ -276,19 +285,19 @@ function Agenda(element, options, methods) {
}
function updateSize(height) {
cachedHeight = height;
function updateSize(width, height) {
viewWidth = width;
viewHeight = height;
colContentPositions.clear();
bodyTable.width('');
body.width(width);
body.height(height - head.height());
// need this for IE6/7. triggers clientWidth to be calculated for
// later user in this function. this is ridiculous
body[0].clientWidth;
bodyTable.width('');
var topTDs = head.find('tr:first th'),
stripeTDs = bg.find('td'),
contentWidth = body[0].clientWidth;
contentWidth = slotSegmentContainer.width(); // body[0].clientWidth isn't reliable here in IE6
bodyTable.width(contentWidth);
// time-axis width
@ -316,10 +325,6 @@ function Agenda(element, options, methods) {
});
slotHeight = body.find('tr:first div').height() + 1;
// TODO:
//reportTBody(bodyTable.find('tbody'));
// Opera 9.25 doesn't detect the bug when called from agenda
}
function slotClick(ev) {
@ -342,10 +347,8 @@ function Agenda(element, options, methods) {
/* Event Rendering
-----------------------------------------------------------------------------*/
function renderEvents(events) {
view.reportEvents(events);
view.reportEvents(cachedEvents = events);
var i, len=events.length,
dayEvents=[],
slotEvents=[];
@ -356,30 +359,32 @@ function Agenda(element, options, methods) {
slotEvents.push(events[i]);
}
}
renderDaySegs(cachedDaySegs = stackSegs(view.sliceSegs(dayEvents, view.visStart, view.visEnd)));
renderSlotSegs(cachedSlotSegs = compileSlotSegs(slotEvents));
renderDaySegs(daySegments = stackSegs(view.sliceSegs(dayEvents, $.map(dayEvents, visEventEnd), view.visStart, view.visEnd)));
renderSlotSegs(slotSegments = compileSlotSegs(slotEvents));
}
function rerenderEvents(skipCompile) {
view.clearEvents();
if (skipCompile) {
renderDaySegs(cachedDaySegs);
renderSlotSegs(cachedSlotSegs);
}else{
renderEvents(view.cachedEvents);
}
function rerenderEvents() {
clearEvents();
renderEvents(cachedEvents);
}
function clearEvents() {
daySegmentContainer.empty();
slotSegmentContainer.empty();
view._clearEvents(); // only clears the hashes
}
function compileSlotSegs(events) {
var d = addMinutes(cloneDate(view.visStart), minMinute),
ends = $.map(events, visEventEnd),
levels,
segCols = [],
i=0;
for (; i<colCnt; i++) {
levels = stackSegs(view.sliceSegs(events, d, addMinutes(cloneDate(d), maxMinute-minMinute)));
levels = stackSegs(view.sliceSegs(events, ends, d, addMinutes(cloneDate(d), maxMinute-minMinute)));
countForwardSegs(levels);
segCols.push(levels);
addDays(d, 1, true);
@ -389,94 +394,29 @@ function Agenda(element, options, methods) {
// renders 'all-day' events at the top
function renderDaySegs(segRow) {
if (options.allDaySlot) {
var td = head.find('td'),
tdInner = td.find('div div'),
tr = td.parent(),
top = safePosition(tdInner, td, tr, tr.parent()).top,
rowContentHeight = 0,
i, len=segRow.length, level,
levelHeight,
j, seg,
event,
className,
leftDay, leftRounded,
rightDay, rightRounded,
left, right,
eventElement, anchorElement,
triggerRes;
for (i=0; i<len; i++) {
level = segRow[i];
levelHeight = 0;
for (j=0; j<level.length; j++) {
seg = level[j];
event = seg.event;
className = 'fc-event fc-event-hori ';
if (rtl) {
leftDay = seg.end.getDay() - 1;
leftRounded = seg.isEnd;
rightDay = seg.start.getDay();
rightRounded = seg.isStart;
}else{
leftDay = seg.start.getDay();
leftRounded = seg.isStart;
rightDay = seg.end.getDay() - 1;
rightRounded = seg.isEnd;
}
if (leftRounded) {
className += 'fc-corner-left ';
left = bg.find('td:eq('+(((leftDay-Math.max(firstDay,nwe)+colCnt)%colCnt)*dis+dit)+') div div').position().left + axisWidth;
}else{
left = axisWidth;
}
if (rightRounded) {
className += 'fc-corner-right ';
right = bg.find('td:eq('+(((rightDay-Math.max(firstDay,nwe)+colCnt)%colCnt)*dis+dit)+') div div');
right = right.position().left + right.width() + axisWidth;
}else{
right = axisWidth + bg.width();
}
eventElement = $("<div class='" + className + event.className.join(' ') + "'/>")
.append(anchorElement = $("<a/>")
.append($("<span class='fc-event-title' />")
.text(event.title)));
if (event.url) {
anchorElement.attr('href', event.url);
}
triggerRes = view.trigger('eventRender', event, event, eventElement);
if (triggerRes !== false) {
if (triggerRes && typeof triggerRes != 'boolean') {
eventElement = $(triggerRes);
}
eventElement
.css({
position: 'absolute',
top: top,
left: left,
zIndex: 8
})
.appendTo(head);
setOuterWidth(eventElement, right-left, true);
view.eventElementHandlers(event, eventElement);
if (event.editable || event.editable == undefined && options.editable) {
draggableDayEvent(event, eventElement, seg.isStart);
if (seg.isEnd) {
view.resizableDayEvent(event, eventElement, colWidth);
}
}
view.reportEventElement(event, eventElement);
view.trigger('eventAfterRender', event, event, eventElement);
levelHeight = Math.max(levelHeight, eventElement.outerHeight(true));
}
}
top += levelHeight;
rowContentHeight += levelHeight;
}
tdInner.height(rowContentHeight);
updateSize(cachedHeight); // tdInner might have pushed the body down, so resize
_renderDaySegs(
[segRow],
view,
axisWidth,
viewWidth,
function() {
return head.find('tr.fc-all-day')
},
function(dayOfWeek) {
return axisWidth + colContentPositions.left(day2col(dayOfWeek));
},
function(dayOfWeek) {
return axisWidth + colContentPositions.right(day2col(dayOfWeek));
},
daySegmentContainer,
bootstrapDayEventHandlers
);
updateSize(viewWidth, viewHeight); // might have pushed the body down, so resize
}
}
@ -485,94 +425,182 @@ function Agenda(element, options, methods) {
// renders events in the 'time slots' at the bottom
function renderSlotSegs(segCols) {
var colI, colLen=segCols.length, col,
levelI, level,
segI, seg,
forward,
event,
top, bottom,
tdInner,
width, left,
var event,
className,
eventElement, anchorElement, timeElement, titleElement,
triggerRes;
for (colI=0; colI<colLen; colI++) {
col = segCols[colI];
for (levelI=0; levelI<col.length; levelI++) {
level = col[levelI];
for (segI=0; segI<level.length; segI++) {
seg = level[segI];
forward = seg.forward || 0;
event = seg.event;
top = timePosition(seg.start, seg.start);
bottom = timePosition(seg.start, seg.end);
tdInner = bg.find('td:eq(' + (colI*dis + dit) + ') div div');
availWidth = tdInner.width();
availWidth = Math.min(availWidth-6, availWidth*.95); // TODO: move this to CSS
if (levelI) {
// indented and thin
width = availWidth / (levelI + forward + 1);
}else{
if (forward) {
// moderately wide, aligned left still
width = ((availWidth / (forward + 1)) - (12/2)) * 2; // 12 is the predicted width of resizer =
}else{
// can be entire width, aligned left
width = availWidth;
}
}
left = axisWidth + tdInner.position().left + // leftmost possible
(availWidth / (levelI + forward + 1) * levelI) // indentation
* dis + (rtl ? availWidth - width : 0); // rtl
className = 'fc-event fc-event-vert ';
if (seg.isStart) {
className += 'fc-corner-top ';
}
if (seg.isEnd) {
className += 'fc-corner-bottom ';
}
eventElement = $("<div class='" + className + event.className.join(' ') + "' />")
.append(anchorElement = $("<a><span class='fc-event-bg'/></a>")
.append(timeElement = $("<span class='fc-event-time'/>")
.text(formatDates(event.start, event.end, view.option('timeFormat'))))
.append(titleElement = $("<span class='fc-event-title'/>")
.text(event.title)))
if (event.url) {
anchorElement.attr('href', event.url);
}
triggerRes = view.trigger('eventRender', event, event, eventElement);
if (triggerRes !== false) {
if (triggerRes && typeof triggerRes != 'boolean') {
eventElement = $(triggerRes);
}
eventElement
.css({
position: 'absolute',
zIndex: 8,
top: top,
left: left
})
.appendTo(bodyContent);
setOuterWidth(eventElement, width, true);
setOuterHeight(eventElement, bottom-top, true);
if (eventElement.height() - titleElement.position().top < 10) {
// event title doesn't have enough room, put next to the time
timeElement.text(formatDate(event.start, view.option('timeFormat')) + ' - ' + event.title);
titleElement.remove();
}
view.eventElementHandlers(event, eventElement);
if (event.editable || event.editable == undefined && options.editable) {
draggableSlotEvent(event, eventElement, timeElement);
if (seg.isEnd) {
resizableSlotEvent(event, eventElement, timeElement);
}
}
}
view.reportEventElement(event, eventElement);
view.trigger('eventAfterRender', event, event, eventElement);
top,
bottom,
leftmost,
availWidth,
forward,
width,
left,
eventTops=[],
eventLefts=[],
eventOuterWidths=[],
eventOuterHeights=[],
html='',
eventElements,
eventElement,
triggerRes,
eventVSides=[],
eventHSides=[],
eventTitleTops=[],
height;
// calculate desired position/dimensions, create html
eachLeaf(segCols, function(l, seg, segI, levelI, colI) {
event = seg.event;
className = 'fc-event fc-event-vert ';
if (seg.isStart) {
className += 'fc-corner-top ';
}
if (seg.isEnd) {
className += 'fc-corner-bottom ';
}
top = timePosition(seg.start, seg.start);
bottom = timePosition(seg.start, seg.end);
leftmost = axisWidth + colContentPositions.left(colI*dis + dit);
availWidth = axisWidth + colContentPositions.right(colI*dis + dit) - leftmost;
availWidth = Math.min(availWidth-6, availWidth*.95); // TODO: move this to CSS
forward = seg.forward || 0;
if (levelI) {
// indented and thin
width = availWidth / (levelI + forward + 1);
}else{
if (forward) {
// moderately wide, aligned left still
width = ((availWidth / (forward + 1)) - (12/2)) * 2; // 12 is the predicted width of resizer =
}else{
// can be entire width, aligned left
width = availWidth;
}
}
left = leftmost + // leftmost possible
(availWidth / (levelI + forward + 1) * levelI) // indentation
* dis + (rtl ? availWidth - width : 0); // rtl
eventTops[l] = top;
eventLefts[l] = left;
eventOuterWidths[l] = width;
eventOuterHeights[l] = bottom - top;
html +=
"<div class='" + className + event.className.join(' ') + "' style='position:absolute;z-index:8;top:" + top + "px;left:" + left + "px'>" +
"<a" + (event.url ? " href='" + htmlEscape(event.url) + "'" : '') + ">" +
"<span class='fc-event-time'>" + htmlEscape(formatDates(event.start, event.end, view.option('timeFormat'))) + "</span>" +
"<span class='fc-event-title'>" + htmlEscape(event.title) + "</span>" +
"<span class='fc-event-bg'/>" +
"</a>" +
((event.editable || event.editable == undefined && options.editable) && !options.disableResizing && $.fn.resizable ?
"<div class='ui-resizable-handle ui-resizable-s'>=</div>"
: '') +
"</div>";
});
slotSegmentContainer.html(html);
eventElements = slotSegmentContainer.children();
// retrieve elements, run through eventRender callback, record outer-edge dimensions
eachLeaf(segCols, function(l, seg) {
event = seg.event;
eventElement = eventElements.eq(l);
triggerRes = view.trigger('eventRender', event, event, eventElement);
if (triggerRes === false) {
eventElement.remove();
}else{
if (triggerRes && triggerRes !== true) {
eventElement.remove();
eventElement = $(triggerRes)
.css({
top: eventTops[l],
left: eventLefts[l]
})
.appendTo(slotSegmentContainer);
}
seg.element = eventElement;
eventVSides[l] = vsides(eventElement, true);
eventHSides[l] = hsides(eventElement, true);
eventTitleTops[l] = eventElement.find('span.fc-event-title').position().top;
bootstrapSlotEventHandlers(event, seg, eventElement);
view.reportEventElement(event, eventElement);
}
});
// set all positions/dimensions at once
eachLeaf(segCols, function(l, seg) {
if (eventElement = seg.element) {
eventElement
.width(eventOuterWidths[l] - eventHSides[l])
.height(height = eventOuterHeights[l] - eventVSides[l]);
event = seg.event;
if (height - eventTitleTops[l] < 10) {
// not enough room for title, put it in the time header
eventElement.find('span.fc-event-time')
.text(formatDate(event.start, view.option('timeFormat')) + ' - ' + event.title);
eventElement.find('span.fc-event-title')
.remove();
}
view.trigger('eventAfterRender', event, event, eventElement);
}
});
}
function visEventEnd(event) { // returns exclusive 'visible' end, for rendering
if (event.allDay) {
if (event.end) {
var end = cloneDate(event.end);
return (event.allDay || end.getHours() || end.getMinutes()) ? addDays(end, 1) : end;
}else{
return addDays(cloneDate(event.start), 1);
}
}
if (event.end) {
return cloneDate(event.end);
}else{
return addMinutes(cloneDate(event.start), options.defaultEventMinutes);
}
}
function bootstrapDayEventHandlers(event, seg, eventElement) {
var attached = false;
eventElement.mouseover(function(ev) {
if (!attached) {
view.eventElementHandlers(event, eventElement);
if (event.editable || event.editable == undefined && options.editable) {
draggableDayEvent(event, eventElement, seg.isStart);
if (seg.isEnd) {
view.resizableDayEvent(event, eventElement, colWidth);
}
}
attached = true;
view.trigger('eventMouseover', this, event, ev);
}
});
}
function bootstrapSlotEventHandlers(event, seg, eventElement) {
var attached = false;
eventElement.mouseover(function(ev) {
if (!attached) {
view.eventElementHandlers(event, eventElement);
if (event.editable || event.editable == undefined && options.editable) {
var timeElement = eventElement.find('span.fc-event-time');
draggableSlotEvent(event, eventElement, timeElement);
if (seg.isEnd) {
resizableSlotEvent(event, eventElement, timeElement);
}
}
attached = true;
view.trigger('eventMouseover', this, event, ev);
}
});
}
@ -798,7 +826,9 @@ function Agenda(element, options, methods) {
var slotDelta, prevSlotDelta;
eventElement
.resizable({
handles: 's',
handles: {
s: 'div.ui-resizable-s'
},
grid: slotHeight,
start: function(ev, ui) {
slotDelta = prevSlotDelta = 0;
@ -834,15 +864,11 @@ function Agenda(element, options, methods) {
// BUG: if event was really short, need to put title back in span
}
}
})
.find('div.ui-resizable-s').text('=');
});
}
}
// ALL-DAY event resizing w/ 'view' methods...
/* Misc
@ -865,9 +891,16 @@ function Agenda(element, options, methods) {
td = tr.find('td'),
innerDiv = td.find('div');
return Math.max(0, Math.round(
safePosition(innerDiv, td, tr, tr.parent()).top - 1 + slotHeight * ((minutes % slotMinutes) / slotMinutes)
innerDiv.position().top + topCorrect(td) - 1 + slotHeight * ((minutes % slotMinutes) / slotMinutes)
));
}
function day2col(dayOfWeek) {
return ((dayOfWeek - Math.max(firstDay,nwe)+colCnt) % colCnt)*dis+dit;
}
}

350
src/grid.js
View file

@ -8,7 +8,7 @@ setDefaults({
views.month = function(element, options) {
return new Grid(element, options, {
render: function(date, delta, height, fetchEvents) {
render: function(date, delta, width, height, fetchEvents) {
if (delta) {
addMonths(date, delta);
date.setDate(1);
@ -44,7 +44,7 @@ views.month = function(element, options) {
rowCnt, options.weekends ? 7 : 5,
this.option('columnFormat'),
true,
height,
width, height,
fetchEvents
);
}
@ -53,7 +53,7 @@ views.month = function(element, options) {
views.basicWeek = function(element, options) {
return new Grid(element, options, {
render: function(date, delta, height, fetchEvents) {
render: function(date, delta, width, height, fetchEvents) {
if (delta) {
addDays(date, delta * 7);
}
@ -77,7 +77,7 @@ views.basicWeek = function(element, options) {
1, options.weekends ? 7 : 5,
this.option('columnFormat'),
false,
height,
width, height,
fetchEvents
);
}
@ -86,7 +86,7 @@ views.basicWeek = function(element, options) {
views.basicDay = function(element, options) {
return new Grid(element, options, {
render: function(date, delta, height, fetchEvents) {
render: function(date, delta, width, height, fetchEvents) {
if (delta) {
addDays(date, delta);
if (!options.weekends) {
@ -96,7 +96,13 @@ views.basicDay = function(element, options) {
this.title = formatDate(date, this.option('titleFormat'), options);
this.start = this.visStart = cloneDate(date, true);
this.end = this.visEnd = addDays(cloneDate(this.start), 1);
this.renderGrid(1, 1, this.option('columnFormat'), false, height, fetchEvents);
this.renderGrid(
1, 1,
this.option('columnFormat'),
false,
width, height,
fetchEvents
);
}
});
}
@ -104,7 +110,7 @@ views.basicDay = function(element, options) {
// rendering bugs
var tdHeightBug, rtlLeftDiff;
var tdHeightBug;
function Grid(element, options, methods) {
@ -112,27 +118,27 @@ function Grid(element, options, methods) {
var tm, firstDay,
nwe, // no weekends (int)
rtl, dis, dit, // day index sign / translate
viewWidth, viewHeight,
rowCnt, colCnt,
colWidth,
thead, tbody,
cachedSegs=[], //...
cachedEvents=[],
segments=[],
segmentContainer,
dayContentPositions = new HorizontalPositionCache(function(dayOfWeek) {
return tbody.find('td:eq(' + ((dayOfWeek - Math.max(firstDay,nwe)+colCnt) % colCnt) + ') div div')
}),
// ...
// initialize superclass
view = $.extend(this, viewMethods, methods, {
renderGrid: renderGrid,
renderEvents: renderEvents,
rerenderEvents: rerenderEvents,
clearEvents: clearEvents,
updateSize: updateSize,
defaultEventEnd: function(event) { // calculates an end if event doesnt have one, mostly for resizing
return cloneDate(event.start);
},
visEventEnd: function(event) { // returns exclusive 'visible' end, for rendering
if (event.end) {
var end = cloneDate(event.end);
return (event.allDay || end.getHours() || end.getMinutes()) ? addDays(end, 1) : end;
}else{
return addDays(cloneDate(event.start), 1);
}
}
});
view.init(element, options);
@ -148,7 +154,7 @@ function Grid(element, options, methods) {
element.disableSelection();
}
function renderGrid(r, c, colFormat, showNumbers, height, fetchEvents) {
function renderGrid(r, c, colFormat, showNumbers, width, height, fetchEvents) {
rowCnt = r;
colCnt = c;
@ -210,10 +216,12 @@ function Grid(element, options, methods) {
}
tbody = $(s + "</tbody>").appendTo(table);
tbody.find('td').click(dayClick);
segmentContainer = $("<div/>").appendTo(element);
}else{ // NOT first time, reuse as many cells as possible
view.clearEvents();
clearEvents();
var prevRowCnt = tbody.find('tr').length;
if (rowCnt < prevRowCnt) {
@ -296,7 +304,7 @@ function Grid(element, options, methods) {
}
updateSize(height);
updateSize(width, height);
fetchEvents(renderEvents);
};
@ -312,10 +320,13 @@ function Grid(element, options, methods) {
}
function updateSize(height) {
function updateSize(width, height) { // does not render/position the events
viewWidth = width;
viewHeight = height;
dayContentPositions.clear();
var leftTDs = tbody.find('tr td:first-child'),
tbodyHeight = height - thead.height(),
tbodyHeight = viewHeight - thead.height(),
rowHeight1, rowHeight2;
if (options.weekMode == 'variable') {
@ -325,8 +336,6 @@ function Grid(element, options, methods) {
rowHeight2 = tbodyHeight - rowHeight1*(rowCnt-1);
}
reportTBody(tbody);
if (tdHeightBug == undefined) {
// bug in firefox where cell height includes padding
var tr = tbody.find('tr:first'),
@ -345,11 +354,11 @@ function Grid(element, options, methods) {
setOuterWidth(
thead.find('th').slice(0, -1),
colWidth = Math.floor(element.width() / colCnt)
colWidth = Math.floor(viewWidth / colCnt)
);
}
/* Event Rendering
@ -357,18 +366,20 @@ function Grid(element, options, methods) {
function renderEvents(events) {
view.reportEvents(events);
renderSegs(cachedSegs = compileSegs(events));
view.reportEvents(cachedEvents = events);
renderSegs(segments = compileSegs(events));
}
function rerenderEvents(skipCompile) {
view.clearEvents();
if (skipCompile) {
renderSegs(cachedSegs);
}else{
renderEvents(view.cachedEvents);
}
function rerenderEvents() {
clearEvents();
renderSegs(segments = compileSegs(cachedEvents));
}
function clearEvents() {
view._clearEvents(); // only clears the hashes
segmentContainer.empty();
}
@ -378,7 +389,7 @@ function Grid(element, options, methods) {
rows = [],
i=0;
for (; i<rowCnt; i++) {
rows.push(stackSegs(view.sliceSegs(events, d1, d2)));
rows.push(stackSegs(view.sliceSegs(events, $.map(events, visEventEnd), d1, d2)));
addDays(d1, 7);
addDays(d2, 7);
}
@ -386,108 +397,51 @@ function Grid(element, options, methods) {
}
function renderSegs(segRows) {
var i, len = segRows.length, levels,
tr, td,
innerDiv,
top,
rowContentHeight,
j, segs,
levelHeight,
k, seg,
event,
className,
startElm, endElm,
left, right,
eventElement, eventAnchor,
triggerRes;
for (i=0; i<len; i++) {
levels = segRows[i];
tr = tbody.find('tr:eq('+i+')');
td = tr.find('td:first');
innerDiv = td.find('div.fc-day-content div').css('position', 'relative');
top = safePosition(innerDiv, td, tr, tbody).top;
rowContentHeight = 0;
for (j=0; j<levels.length; j++) {
segs = levels[j];
levelHeight = 0;
for (k=0; k<segs.length; k++) {
seg = segs[k];
event = seg.event;
className = 'fc-event fc-event-hori ';
startElm = seg.isStart ?
tr.find('td:eq('+((seg.start.getDay()-Math.max(firstDay,nwe)+colCnt)%colCnt)+') div div') :
tbody;
endElm = seg.isEnd ?
tr.find('td:eq('+((seg.end.getDay()-Math.max(firstDay,nwe)+colCnt-1)%colCnt)+') div div') :
tbody;
if (rtl) {
left = endElm.position().left;
right = startElm.position().left + startElm.width();
if (seg.isStart) {
className += 'fc-corner-right ';
}
if (seg.isEnd) {
className += 'fc-corner-left ';
}
}else{
left = startElm.position().left;
right = endElm.position().left + endElm.width();
if (seg.isStart) {
className += 'fc-corner-left ';
}
if (seg.isEnd) {
className += 'fc-corner-right ';
}
}
eventElement = $("<div class='" + className + event.className.join(' ') + "'/>")
.append(eventAnchor = $("<a/>")
.append(event.allDay || !seg.isStart ? null :
$("<span class='fc-event-time'/>")
.html(formatDates(event.start, event.end, view.option('timeFormat'), options)))
.append($("<span class='fc-event-title'/>")
.text(event.title)));
if (event.url) {
eventAnchor.attr('href', event.url);
}
triggerRes = view.trigger('eventRender', event, event, eventElement);
if (triggerRes !== false) {
if (triggerRes && typeof triggerRes != 'boolean') {
eventElement = $(triggerRes);
}
eventElement
.css({
position: 'absolute',
top: top,
left: left + (rtlLeftDiff||0),
zIndex: 8
})
.appendTo(element);
setOuterWidth(eventElement, right-left, true);
if (rtl && rtlLeftDiff == undefined) {
// bug in IE6 where offsets are miscalculated with direction:rtl
rtlLeftDiff = left - eventElement.position().left;
if (rtlLeftDiff) {
eventElement.css('left', left + rtlLeftDiff);
}
}
view.eventElementHandlers(event, eventElement);
if (event.editable || event.editable == undefined && options.editable) {
draggableEvent(event, eventElement);
if (seg.isEnd) {
view.resizableDayEvent(event, eventElement, colWidth);
}
}
view.reportEventElement(event, eventElement);
view.trigger('eventAfterRender', event, event, eventElement);
levelHeight = Math.max(levelHeight, eventElement.outerHeight(true));
function renderSegs(segCols) {
_renderDaySegs(
segCols,
view,
0,
viewWidth,
function(i) {
return tbody.find('tr:eq('+i+')');
},
dayContentPositions.left,
dayContentPositions.right,
segmentContainer,
bootstrapEventHandlers
);
}
function visEventEnd(event) { // returns exclusive 'visible' end, for rendering
if (event.end) {
var end = cloneDate(event.end);
return (event.allDay || end.getHours() || end.getMinutes()) ? addDays(end, 1) : end;
}else{
return addDays(cloneDate(event.start), 1);
}
}
function bootstrapEventHandlers(event, seg, eventElement) {
var attached = false;
eventElement.mouseover(function(ev) {
if (!attached) {
view.eventElementHandlers(event, eventElement);
if (event.editable || event.editable == undefined && options.editable) {
draggableEvent(event, eventElement);
if (seg.isEnd) {
view.resizableDayEvent(event, eventElement, colWidth);
}
}
rowContentHeight += levelHeight;
top += levelHeight;
attached = true;
view.trigger('eventMouseover', this, event, ev); // TODO: make sure this isn't being fired twice
}
innerDiv.height(rowContentHeight);
}
});
}
@ -553,3 +507,131 @@ function Grid(element, options, methods) {
};
function _renderDaySegs(segRows, view, minLeft, maxLeft, getTr, dayContentLeft, dayContentRight, segmentContainer, bootstrapEventHandlers) {
var options=view.options,
rtl=options.isRTL,
event,
className,
left,
right,
eventLefts=[],
eventRights=[],
html='',
eventElements,
eventElement,
triggerRes,
eventOuterHeights=[],
eventHSides=[],
l=0,
i=0, len=segRows.length, levels,
tr,
td,
innerDiv,
top,
rowContentHeight,
j, segs,
k, seg;
// calculate desired position/dimensions, create html
eachLeaf(segRows, function(l, seg) {
event = seg.event;
className = 'fc-event fc-event-hori ';
if (rtl) {
if (seg.isStart) {
className += 'fc-corner-right ';
}
if (seg.isEnd) {
className += 'fc-corner-left ';
}
left = seg.isEnd ? dayContentLeft(seg.end.getDay()-1) : minLeft;
right = seg.isStart ? dayContentRight(seg.start.getDay()) : maxLeft;
}else{
if (seg.isStart) {
className += 'fc-corner-left ';
}
if (seg.isEnd) {
className += 'fc-corner-right ';
}
left = seg.isStart ? dayContentLeft(seg.start.getDay()) : minLeft;
right = seg.isEnd ? dayContentRight(seg.end.getDay()-1) : maxLeft;
}
eventLefts[l] = left;
eventRights[l] = right;
html +=
"<div class='" + className + event.className.join(' ') + "' style='position:absolute;z-index:8;left:"+left+"px'>" +
"<a" + (event.url ? " href='" + htmlEscape(event.url) + "'" : '') + ">" +
(!event.allDay && seg.isStart ?
"<span class='fc-event-time'>" +
htmlEscape(formatDates(event.start, event.end, view.option('timeFormat'), options)) +
"</span>"
:'') +
"<span class='fc-event-title'>" + htmlEscape(event.title) + "</span>" +
"</a>" +
"</div>";
});
segmentContainer.html(html);
eventElements = segmentContainer.children();
// retrieve elements, run through eventRender callback, record outer-edge dimensions
eachLeaf(segRows, function(l, seg) {
event = seg.event;
eventElement = eventElements.eq(l);
triggerRes = view.trigger('eventRender', event, event, eventElement);
if (triggerRes === false) {
eventElement.remove();
}else{
if (triggerRes && triggerRes !== true) {
eventElement.remove();
eventElement = $(triggerRes)
.css('left', eventLefts[l])
.appendTo(segmentContainer);
}
seg.element = eventElement;
eventOuterHeights[l] = eventElement.outerHeight(true);
eventHSides[l] = hsides(eventElement, true);
bootstrapEventHandlers(event, seg, eventElement);
view.reportEventElement(event, eventElement);
}
});
// set all positions/dimensions at once
for (; i<len; i++) {
levels = segRows[i];
tr = getTr(i);
td = tr.find('td:first');
innerDiv = td.find('div.fc-day-content div')
.css('position', 'relative')
.height(''); // this is needed for IE7 to get an accurate position
top = innerDiv.position().top + topCorrect(td);
rowContentHeight = 0;
for (j=0; j<levels.length; j++) {
segs = levels[j];
levelHeight = 0;
for (k=0; k<segs.length; k++) {
seg = segs[k];
if (eventElement = seg.element) {
eventElement.css('top', top);
//if (rtl && rtlLeftDiff == undefined) {
// // bug in IE6 where offsets are miscalculated with direction:rtl
// rtlLeftDiff = eventLefts[l] - eventElement.position().left;
// if (rtlLeftDiff) {
// eventElement.css('left', eventLefts[l] + rtlLeftDiff);
// }
//}
eventElement.width(eventRights[l] - eventLefts[l] - eventHSides[l]);
event = seg.event;
view.trigger('eventAfterRender', event, event, eventElement);
levelHeight = Math.max(levelHeight, eventOuterHeights[l]);
}
l++;
}
rowContentHeight += levelHeight;
top += levelHeight;
}
innerDiv.height(rowContentHeight);
}
}

4376
src/jquery/jquery-uncompressed.js vendored Normal file
View file

File diff suppressed because it is too large Load diff

26
src/main.js
View file

@ -149,7 +149,9 @@ $.fn.fullCalendar = function(options) {
element = $(_element).addClass('fc'),
elementWidth,
content = $("<div class='fc-content " + tm + "-widget-content' style='position:relative'/>").prependTo(_element), // relative for ie6
contentWidth,
contentHeight;
if (options.isRTL) {
element.addClass('fc-rtl');
}
@ -214,11 +216,12 @@ $.fn.fullCalendar = function(options) {
function render(inc, forceUpdateSize) {
if ((elementWidth = _element.offsetWidth) !== 0) { // visible on the screen
if (!contentHeight) {
contentWidth = content.width();
contentHeight = calculateContentHeight();
}
if (inc || !view.date || date < view.visStart || date > view.visEnd ) { // !view.date means it hasn't been rendered yet
fixContentSize();
view.render(date, inc || 0, contentHeight, function(callback) {
view.render(date, inc || 0, contentWidth, contentHeight, function(callback) {
// dont refetch if new view contains the same events (or a subset)
if (!eventStart || view.visStart < eventStart || view.visEnd > eventEnd) {
fetchEvents(callback);
@ -230,12 +233,14 @@ $.fn.fullCalendar = function(options) {
view.date = cloneDate(date);
}
else if (view.sizeDirty || forceUpdateSize) {
view.updateSize(contentHeight);
view.rerenderEvents();
view.updateSize(contentWidth, contentHeight);
view.rerenderEvents(); // TODO: could probably skip recompile??
}
else if (view.eventsDirty) {
// ensure events are rerendered if another view messed with them
// pass in 'events' b/c event might have been added/removed
// executed on a switchView
// TODO: should this be inclusive with sizeDirty and forceUpdateSize??
view.clearEvents();
view.renderEvents(events);
}
@ -257,7 +262,7 @@ $.fn.fullCalendar = function(options) {
}
// marks other views' events as dirty
function eventsDirtyExcept(exceptView) {
function eventsDirtyExcept(exceptView) { // TODO: otherViewsEventsDirty
$.each(viewInstances, function() {
if (this != exceptView) {
this.eventsDirty = true;
@ -283,16 +288,17 @@ $.fn.fullCalendar = function(options) {
// called when we know the element size has changed
function sizeChanged(fix) {
contentWidth = content.width();
contentHeight = calculateContentHeight();
if (fix) {
fixContentSize();
}
view.updateSize(contentHeight);
view.updateSize(contentWidth, contentHeight);
if (fix) {
unfixContentSize();
}
sizesDirtyExcept(view);
view.rerenderEvents(true);
view.rerenderEvents();
}
// calculate what the height of the content should be
@ -301,9 +307,9 @@ $.fn.fullCalendar = function(options) {
return options.contentHeight;
}
else if (options.height) {
return options.height - (header ? header.height() : 0) - horizontalSides(content);
return options.height - (header ? header.height() : 0) - horizontalSides(content); // TODO: shouldn't this be vertical sides??
}
return elementWidth / Math.max(options.aspectRatio, .5);
return Math.round(contentWidth / Math.max(options.aspectRatio, .5));
}
@ -776,7 +782,7 @@ $.fn.fullCalendar = function(options) {
}
}
};
$(window).resize(windowResize);
//$(window).resize(windowResize);
// let's begin...
@ -787,7 +793,7 @@ $.fn.fullCalendar = function(options) {
setTimeout(function() {
render();
content.hide().show(); // needed for IE 6
view.rerenderEvents(); // needed for IE 7
view.rerenderEvents(); // needed for IE 7 // TODO: could probably skip recompile
}, 0);
}

135
src/util.js
View file

@ -4,7 +4,8 @@
var DAY_MS = 86400000,
HOUR_MS = 3600000,
MINUTE_MS = 60000;
MINUTE_MS = 60000,
arrayPop = Array.prototype.pop; // for eachLeaf
function addYears(d, n, keepTime) {
d.setFullYear(d.getFullYear() + n);
@ -300,39 +301,35 @@ var dateFormatters = {
function setOuterWidth(element, width, includeMargins) {
element.each(function() {
var e = $(this);
var w = width - horizontalSides(e);
if (includeMargins) {
w -= (parseInt(e.css('margin-left')) || 0) +
(parseInt(e.css('margin-right')) || 0);
}
e.width(w);
e.width(width - hsides(e, includeMargins));
});
}
function horizontalSides(e) {
function hsides(e, includeMargins) {
return (parseInt(e.css('border-left-width')) || 0) +
(parseInt(e.css('padding-left')) || 0) +
(parseInt(e.css('padding-right')) || 0) +
(parseInt(e.css('border-right-width')) || 0);
(parseInt(e.css('border-right-width')) || 0) +
(includeMargins ?
(parseInt(e.css('margin-left')) || 0) + (parseInt(e.css('margin-right')) || 0)
: 0);
}
function setOuterHeight(element, height, includeMargins) {
element.each(function() {
var e = $(this);
var h = height - verticalSides(e);
if (includeMargins) {
h -= (parseInt(e.css('margin-top')) || 0) +
(parseInt(e.css('margin-bottom')) || 0);
}
e.height(h);
e.height(height - vsides(e, includeMargins));
});
}
function verticalSides(e) {
function vsides(e, includeMargins) {
return (parseInt(e.css('border-top-width')) || 0) +
(parseInt(e.css('padding-top')) || 0) +
(parseInt(e.css('padding-bottom')) || 0) +
(parseInt(e.css('border-bottom-width')) || 0);
(parseInt(e.css('border-bottom-width')) || 0) +
(includeMargins ?
(parseInt(e.css('margin-top')) || 0) + (parseInt(e.css('margin-bottom')) || 0)
: 0);
}
@ -340,22 +337,24 @@ function verticalSides(e) {
/* Position Calculation
-----------------------------------------------------------------------------*/
// nasty bugs in opera 9.25
// position() returning relative to direct parent
// position()'s top returning incorrectly with TR/TD or elements within TD
var operaPositionBug;
var topBug;
function reportTBody(tbody) {
if (operaPositionBug == undefined) {
operaPositionBug = tbody.position().top != tbody.find('tr').position().top;
function topCorrect(tr) { // tr/th/td or anything else
if (topBug !== false) {
var cell;
if (tr.is('th,td')) {
tr = (cell = tr).parent();
}
if (topBug == undefined && tr.is('tr')) {
topBug = tr.position().top != tr.children().position().top;
}
if (topBug) {
return tr.parent().position().top + (cell ? tr.position().top - cell.position().top : 0);
}
}
}
function safePosition(element, td, tr, tbody) {
var position = element.position();
if (operaPositionBug) {
position.top += tbody.position().top + tr.position().top - td.position().top;
}
return position;
return 0;
}
@ -365,24 +364,23 @@ function safePosition(element, td, tr, tbody) {
function HoverMatrix(changeCallback) {
var tops=[], lefts=[],
var t=this,
tops=[], lefts=[],
prevRowE, prevColE,
origRow, origCol,
currRow, currCol;
this.row = function(e, topBug) {
t.row = function(e) {
prevRowE = $(e);
tops.push(prevRowE.offset().top + (
(operaPositionBug && prevRowE.is('tr')) ? prevRowE.parent().position().top : 0
));
tops.push(prevRowE.offset().top + topCorrect(prevRowE));
};
this.col = function(e) {
t.col = function(e) {
prevColE = $(e);
lefts.push(prevColE.offset().left);
};
this.mouse = function(x, y) {
t.mouse = function(x, y) {
if (origRow == undefined) {
tops.push(tops[tops.length-1] + prevRowE.outerHeight());
lefts.push(lefts[lefts.length-1] + prevColE.outerWidth());
@ -397,13 +395,13 @@ function HoverMatrix(changeCallback) {
currRow = r;
currCol = c;
if (r == -1 || c == -1) {
this.cell = null;
t.cell = null;
}else{
if (origRow == undefined) {
origRow = r;
origCol = c;
}
this.cell = {
t.cell = {
row: r,
col: c,
top: tops[r],
@ -415,7 +413,7 @@ function HoverMatrix(changeCallback) {
colDelta: c-origCol
};
}
changeCallback(this.cell);
changeCallback(t.cell);
}
};
@ -433,7 +431,7 @@ function zeroPad(n) {
return (n < 10 ? '0' : '') + n;
}
function smartProperty(obj, name) { // get a camel-cased/namespaced property
function smartProperty(obj, name) { // get a camel-cased/namespaced property of an object
if (obj[name] != undefined) {
return obj[name];
}
@ -448,4 +446,59 @@ function smartProperty(obj, name) { // get a camel-cased/namespaced property
return obj[''];
}
function htmlEscape(s) {
return s
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/'/g, '&#039;')
.replace(/"/g, '&quot;')
}
function eachLeaf(node, callback, leafIndex, indexTrail) {
if (node.pop == arrayPop) { // is an array?
for (var i=0, len=node.length; i<len; i++) {
leafIndex = eachLeaf(node[i], callback, leafIndex||0, [i].concat(indexTrail||[]));
}
return leafIndex;
}
callback.apply(node, [leafIndex, node].concat(indexTrail));
return leafIndex + 1;
}
function HorizontalPositionCache(getElement) {
var t = this,
elements = {},
lefts = {},
rights = {};
function e(i) {
return elements[i] =
elements[i] || getElement(i);
}
t.left = function(i) {
return lefts[i] =
lefts[i] == undefined ? e(i).position().left : lefts[i];
};
t.right = function(i) {
return rights[i] =
rights[i] == undefined ? t.left(i) + e(i).width() : rights[i];
};
t.clear = function() {
elements = {};
lefts = {};
rights = {};
};
}

17
src/view.js
View file

@ -14,7 +14,6 @@ var viewMethods = {
* - visStart
* - visEnd
* - defaultEventEnd(event)
* - visEventEnd(event)
* - render(events)
* - rerenderEvents()
*
@ -31,7 +30,6 @@ var viewMethods = {
init: function(element, options) {
this.element = element;
this.options = options;
this.cachedEvents = [];
this.eventsByID = {};
this.eventElements = [];
this.eventElementsByID = {};
@ -61,8 +59,7 @@ var viewMethods = {
reportEvents: function(events) { // events are already normalized at this point
var i, len=events.length, event,
eventsByID = this.eventsByID = {},
cachedEvents = this.cachedEvents = [];
eventsByID = this.eventsByID = {};
for (i=0; i<len; i++) {
event = events[i];
if (eventsByID[event._id]) {
@ -70,7 +67,6 @@ var viewMethods = {
}else{
eventsByID[event._id] = [event];
}
cachedEvents.push(event);
}
},
@ -92,10 +88,7 @@ var viewMethods = {
// event element manipulation
clearEvents: function() { // only remove ELEMENTS
$.each(this.eventElements, function() {
this.remove();
});
_clearEvents: function() { // only resets hashes
this.eventElements = [];
this.eventElementsByID = {};
},
@ -273,7 +266,7 @@ var viewMethods = {
// event rendering utilities
sliceSegs: function(events, start, end) {
sliceSegs: function(events, visEventEnds, start, end) {
var segs = [],
i, len=events.length, event,
eventStart, eventEnd,
@ -282,7 +275,7 @@ var viewMethods = {
for (i=0; i<len; i++) {
event = events[i];
eventStart = event.start;
eventEnd = this.visEventEnd(event);
eventEnd = visEventEnds[i];
if (eventEnd > start && eventStart < end) {
if (eventStart < start) {
segStart = cloneDate(start);
@ -359,3 +352,5 @@ function segsCollide(seg1, seg2) {
return seg1.end > seg2.start && seg1.start < seg2.end;
}

2
tests/loader.js
View file

@ -63,7 +63,7 @@ else if (_build) {
includeJS('../build/fullcalendar/jquery/ui.resizable.js');
}
else {
includeJS('../src/jquery/jquery.js');
includeJS('../src/jquery/jquery-uncompressed.js');
includeJS('../src/jquery/ui.core.js');
includeJS('../src/jquery/ui.draggable.js');
includeJS('../src/jquery/ui.resizable.js');

47
tests/many_agenda_events.html Normal file
View file

@ -0,0 +1,47 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<link rel='stylesheet' type='text/css' href='../examples/redmond/theme.css' />
<script type='text/javascript'>DISABLE_FIREBUG_LITE=true</script>
<script type='text/javascript' src='loader.js'></script>
<script type='text/javascript'>
$(document).ready(function() {
$('#calendar').fullCalendar({
defaultView: 'agendaWeek',
year: 2009,
month: 11,
date: 16,
header: {
left: 'prev,next today',
center: 'title',
right: 'month,agendaWeek,basicWeek,agendaDay,basicDay'
},
editable: true,
events: 'many_agenda_events_json.txt'
});
});
</script>
<style type='text/css'>
body {
margin-top: 40px;
text-align: center;
font-size: 13px;
font-family: "Lucida Grande",Helvetica,Arial,Verdana,sans-serif;
}
#calendar {
width: 900px;
margin: 0 auto;
}
</style>
</head>
<body>
<div id='calendar'></div>
</body>
</html>

2046
tests/many_agenda_events_json.txt Normal file
View file

File diff suppressed because it is too large Load diff

9
tests/many_events.html
View file

@ -7,19 +7,16 @@
<script type='text/javascript'>
$(document).ready(function() {
var date = new Date();
var d = date.getDate();
var m = date.getMonth();
var y = date.getFullYear();
$('#calendar').fullCalendar({
year: 2009,
month: 11,
header: {
left: 'prev,next today',
center: 'title',
right: 'month,agendaWeek,basicWeek,agendaDay,basicDay'
},
//editable: true,
editable: true,
events: 'many_events_json.txt'
});