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

Merge pull request #18 from zvictor/v2

Browse Source 
Replacing the old date api by the momentjs API
This commit is contained in:
sean kenny
2014-08-05 09:27:50 +01:00
parent 87122fc217 aa8993dcf6
commit 44edcd914e
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resource/ResourceEventRenderer.js
+11 -11
View File
@@ -97,7 +97,7 @@ function ResourceEventRenderer() {
for (i=0; i<colCnt; i++) {
d = t.visStart.clone();
addMinutes(d, minMinute);
d.add('m', minMinute);
var resourceEvents = eventsForResource(resources()[i], events);
visEventEnds = $.map(resourceEvents, slotEventEnd);
@@ -106,7 +106,7 @@ function ResourceEventRenderer() {
resourceEvents,
visEventEnds,
d,
addMinutes(cloneDate(d), maxMinute-minMinute)
d.clone().add('m', maxMinute-minMinute)
)
);
countForwardSegs(col);
@@ -137,14 +137,14 @@ function ResourceEventRenderer() {
eventEnd = visEventEnds[i];
if (eventEnd > start && eventStart < end) {
if (eventStart < start) {
segStart = cloneDate(start);
segStart = start.clone();
isStart = false;
}else{
segStart = eventStart;
isStart = true;
}
if (eventEnd > end) {
segEnd = cloneDate(end);
segEnd = end.clone();
isEnd = false;
}else{
segEnd = eventEnd;
@@ -175,9 +175,9 @@ function ResourceEventRenderer() {
function slotEventEnd(event) {
if (event.end) {
return cloneDate(event.end);
return event.end.clone();
}else{
return addMinutes(cloneDate(event.start), opt('defaultEventMinutes'));
return event.start.clone().add('m', opt('defaultEventMinutes'));
}
}
@@ -415,7 +415,7 @@ function ResourceEventRenderer() {
if (!cell.row) {
// on full-days
renderDayOverlay(
addDays(cloneDate(event.start), dayDelta),
addDays(event.start.clone(), dayDelta),
addDays(exclEndDay(event), dayDelta)
);
resetElement();
@@ -618,7 +618,7 @@ function ResourceEventRenderer() {
timeElement.hide();
eventElement.draggable('option', 'grid', null); // disable grid snapping
renderDayOverlay(
addDays(cloneDate(event.start), dayDelta),
addDays(event.start.clone(), dayDelta),
addDays(exclEndDay(event), dayDelta)
);
}
@@ -631,10 +631,10 @@ function ResourceEventRenderer() {
}
function updateTimeText(minuteDelta) {
var newStart = addMinutes(cloneDate(event.start), minuteDelta);
var newStart = event.start.clone().add('m', minuteDelta);
var newEnd;
if (event.end) {
newEnd = addMinutes(cloneDate(event.end), minuteDelta);
newEnd = event.end.clone().add('m', minuteDelta);
}
timeElement.text(formatDates(newStart, newEnd, opt('timeFormat')));
}
@@ -669,7 +669,7 @@ function ResourceEventRenderer() {
formatDates(
event.start,
(!snapDelta && !event.end) ? null : // no change, so don't display time range
addMinutes(eventEnd(event), snapMinutes*snapDelta),
eventEnd(event).add('m', snapMinutes*snapDelta),
opt('timeFormat')
)
);
src/resource/ResourceView.js
+17 -17
View File
@@ -238,8 +238,8 @@ function ResourceView(element, calendar, viewName) {
"<table class='fc-agenda-slots' style='width:100%' cellspacing='0'>" +
"<tbody>";
d = zeroDate();
maxd = addMinutes(cloneDate(d), maxMinute);
addMinutes(d, minMinute);
maxd = d.clone().add('m', maxMinute);
d.add('m', minMinute);
slotCnt = 0;
for (i=0; d < maxd; i++) {
minutes = d.getMinutes();
@@ -252,7 +252,7 @@ function ResourceView(element, calendar, viewName) {
"<div style='position:relative'>&nbsp;</div>" +
"</td>" +
"</tr>";
addMinutes(d, opt('slotMinutes'));
d.add('m', opt('slotMinutes'));
slotCnt++;
}
s +=
@@ -360,7 +360,7 @@ function ResourceView(element, calendar, viewName) {
var headerClass = tm + "-widget-header"; // TODO: make these when updateOptions() called
var contentClass = tm + "-widget-content";
var date;
var today = clearTime(new Date());
var today = makeMoment(new Date()).stripTime();
var col;
var cellsHTML;
var cellHTML;
@@ -376,7 +376,7 @@ function ResourceView(element, calendar, viewName) {
for (col=0; col<colCnt; col++) {
date = cloneDate(t.visStart);
date = t.visStart.clone();
classNames = [
'fc-col' + col,
@@ -508,7 +508,7 @@ function ResourceView(element, calendar, viewName) {
function resetScroll() {
var d0 = zeroDate();
var scrollDate = cloneDate(d0);
var scrollDate = d0.clone();
scrollDate.setHours(opt('firstHour'));
var top = timePosition(d0, scrollDate) + 1; // +1 for the border
function scroll() {
@@ -586,7 +586,7 @@ function ResourceView(element, calendar, viewName) {
function renderSlotOverlay(overlayStart, overlayEnd, col) {
var dayStart = cellToDate(0, 0);
var dayEnd = addDays(cloneDate(dayStart), 1);
var dayEnd = addDays(dayStart.clone(), 1);
var stretchStart = new Date(Math.max(dayStart, overlayStart));
var stretchEnd = new Date(Math.min(dayEnd, overlayEnd));
if (stretchStart < stretchEnd) {
@@ -690,11 +690,11 @@ function ResourceView(element, calendar, viewName) {
// get the Y coordinate of the given time on the given day (both Date objects)
function timePosition(day, time) { // both date objects. day holds 00:00 of current day
day = cloneDate(day, true);
if (time < addMinutes(cloneDate(day), minMinute)) {
day = day.clone().stripTime();
if (time < day.clone().add('m', minMinute)) {
return 0;
}
if (time >= addMinutes(cloneDate(day), maxMinute)) {
if (time >= day.clone().add('m', maxMinute)) {
return slotTable.height();
}
var slotMinutes = opt('slotMinutes'),
@@ -720,11 +720,11 @@ function ResourceView(element, calendar, viewName) {
function defaultEventEnd(event) {
var start = cloneDate(event.start);
var start = event.start.clone();
if (event.allDay) {
return start;
}
return addMinutes(start, opt('defaultEventMinutes'));
return start.add('m', opt('defaultEventMinutes'));
}
@@ -735,9 +735,9 @@ function ResourceView(element, calendar, viewName) {
function defaultSelectionEnd(startDate, allDay) {
if (allDay) {
return cloneDate(startDate);
return startDate.clone();
}
return addMinutes(cloneDate(startDate), opt('slotMinutes'));
return startDate.clone().add('m', opt('slotMinutes'));
}
@@ -858,9 +858,9 @@ function ResourceView(element, calendar, viewName) {
var d2 = realCellToDate(cell);
dates = [
d1,
addMinutes(cloneDate(d1), snapMinutes), // calculate minutes depending on selection slot minutes
d1.clone().add('m', snapMinutes), // calculate minutes depending on selection slot minutes
d2,
addMinutes(cloneDate(d2), snapMinutes)
d2.clone().add('m', snapMinutes)
].sort(dateCompare);
renderSlotSelection(dates[0], dates[3], cell.col);
}else{
@@ -899,7 +899,7 @@ function ResourceView(element, calendar, viewName) {
renderCellOverlay(cell.row, cell.col, cell.row, cell.col);
}else{
var d1 = realCellToDate(cell);
var d2 = addMinutes(cloneDate(d1), opt('defaultEventMinutes'));
var d2 = d1.clone().add('m', opt('defaultEventMinutes'));
renderSlotOverlay(d1, d2, cell.col);
}
}