From 4db8fc49bf712b61fd2a4cb1154bcd271539d69d Mon Sep 17 00:00:00 2001 From: zVictor Date: Mon, 4 Aug 2014 16:54:52 +0200 Subject: [PATCH 1/3] removed all the cloneDate calls --- src/resource/ResourceEventRenderer.js | 18 +++++++++--------- src/resource/ResourceView.js | 26 +++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/resource/ResourceEventRenderer.js b/src/resource/ResourceEventRenderer.js index 8c896d8..0e83e7a 100644 --- a/src/resource/ResourceEventRenderer.js +++ b/src/resource/ResourceEventRenderer.js @@ -106,7 +106,7 @@ function ResourceEventRenderer() { resourceEvents, visEventEnds, d, - addMinutes(cloneDate(d), maxMinute-minMinute) + addMinutes(d.clone(), 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 addMinutes(event.start.clone(), 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 = addMinutes(event.start.clone(), minuteDelta); var newEnd; if (event.end) { - newEnd = addMinutes(cloneDate(event.end), minuteDelta); + newEnd = addMinutes(event.end.clone(), minuteDelta); } timeElement.text(formatDates(newStart, newEnd, opt('timeFormat'))); } diff --git a/src/resource/ResourceView.js b/src/resource/ResourceView.js index 6299ca2..0fb5e2d 100644 --- a/src/resource/ResourceView.js +++ b/src/resource/ResourceView.js @@ -238,7 +238,7 @@ function ResourceView(element, calendar, viewName) { "" + ""; d = zeroDate(); - maxd = addMinutes(cloneDate(d), maxMinute); + maxd = addMinutes(d.clone(), maxMinute); addMinutes(d, minMinute); slotCnt = 0; for (i=0; d < maxd; i++) { @@ -376,7 +376,7 @@ function ResourceView(element, calendar, viewName) { for (col=0; col= addMinutes(cloneDate(day), maxMinute)) { + if (time >= addMinutes(day.clone(), maxMinute)) { return slotTable.height(); } var slotMinutes = opt('slotMinutes'), @@ -720,7 +720,7 @@ function ResourceView(element, calendar, viewName) { function defaultEventEnd(event) { - var start = cloneDate(event.start); + var start = event.start.clone(); if (event.allDay) { return start; } @@ -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 addMinutes(startDate.clone(), 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 + addMinutes(d1.clone(), snapMinutes), // calculate minutes depending on selection slot minutes d2, - addMinutes(cloneDate(d2), snapMinutes) + addMinutes(d2.clone(), 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 = addMinutes(d1.clone(), opt('defaultEventMinutes')); renderSlotOverlay(d1, d2, cell.col); } } From e6a09434760e667b29db54de15a57aa02f2b7e4a Mon Sep 17 00:00:00 2001 From: zVictor Date: Mon, 4 Aug 2014 16:57:21 +0200 Subject: [PATCH 2/3] removed all the calls to addMinutes --- src/resource/ResourceEventRenderer.js | 12 ++++++------ src/resource/ResourceView.js | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/resource/ResourceEventRenderer.js b/src/resource/ResourceEventRenderer.js index 0e83e7a..c005f5d 100644 --- a/src/resource/ResourceEventRenderer.js +++ b/src/resource/ResourceEventRenderer.js @@ -97,7 +97,7 @@ function ResourceEventRenderer() { for (i=0; i" + ""; d = zeroDate(); - maxd = addMinutes(d.clone(), 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) { "
 
" + "" + ""; - addMinutes(d, opt('slotMinutes')); + d.add('m', opt('slotMinutes')); slotCnt++; } s += @@ -691,10 +691,10 @@ 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 = day.clone().stripTime(); - if (time < addMinutes(day.clone(), minMinute)) { + if (time < day.clone().add('m', minMinute)) { return 0; } - if (time >= addMinutes(day.clone(), maxMinute)) { + if (time >= day.clone().add('m', maxMinute)) { return slotTable.height(); } var slotMinutes = opt('slotMinutes'), @@ -724,7 +724,7 @@ function ResourceView(element, calendar, viewName) { if (event.allDay) { return start; } - return addMinutes(start, opt('defaultEventMinutes')); + return start.add('m', opt('defaultEventMinutes')); } @@ -737,7 +737,7 @@ function ResourceView(element, calendar, viewName) { if (allDay) { return startDate.clone(); } - return addMinutes(startDate.clone(), 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(d1.clone(), snapMinutes), // calculate minutes depending on selection slot minutes + d1.clone().add('m', snapMinutes), // calculate minutes depending on selection slot minutes d2, - addMinutes(d2.clone(), 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(d1.clone(), opt('defaultEventMinutes')); + var d2 = d1.clone().add('m', opt('defaultEventMinutes')); renderSlotOverlay(d1, d2, cell.col); } } From aa8993dcf6050f8aa405d6098dbd091f4d5afad7 Mon Sep 17 00:00:00 2001 From: zVictor Date: Mon, 4 Aug 2014 16:59:35 +0200 Subject: [PATCH 3/3] removed the call to clearTime --- src/resource/ResourceView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resource/ResourceView.js b/src/resource/ResourceView.js index 53ad6f0..55b4f05 100644 --- a/src/resource/ResourceView.js +++ b/src/resource/ResourceView.js @@ -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;