wassname/fullcalendar
1
0
Fork 0
mirror of https://github.com/wassname/fullcalendar.git synced 2026-09-11 12:10:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

code quality improvements (for jshint)

Browse Source
This commit is contained in:
Adam Shaw
2014-01-31 14:05:48 -08:00
parent b23937a015
commit 758a235d19
17 changed files with 97 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/DayEventRenderer.js
+7 -9
View File
@@ -22,13 +22,11 @@ function DayEventRenderer() {
var eventResize = t.eventResize;
var getRowCnt = t.getRowCnt;
var getColCnt = t.getColCnt;
var getColWidth = t.getColWidth;
var allDayRow = t.allDayRow; // TODO: rename
var colLeft = t.colLeft;
var colRight = t.colRight;
var colContentLeft = t.colContentLeft;
var colContentRight = t.colContentRight;
var dateToCell = t.dateToCell;
var getDaySegmentContainer = t.getDaySegmentContainer;
var renderDayOverlay = t.renderDayOverlay;
var clearOverlays = t.clearOverlays;
@@ -351,17 +349,18 @@ function DayEventRenderer() {
var rowContentHeights = calculateVerticals(segments); // also sets segment.top
var rowContentElements = getRowContentElements(); // returns 1 inner div per row
var rowContentTops = [];
var i;
// Set each row's height by setting height of first inner div
if (doRowHeights) {
for (var i=0; i<rowContentElements.length; i++) {
for (i=0; i<rowContentElements.length; i++) {
rowContentElements[i].height(rowContentHeights[i]);
}
}
// Get each row's top, relative to the views's origin.
// Important to do this after setting each row's height.
for (var i=0; i<rowContentElements.length; i++) {
for (i=0; i<rowContentElements.length; i++) {
rowContentTops.push(
rowContentElements[i].position().top
);
@@ -387,6 +386,7 @@ function DayEventRenderer() {
var colCnt = getColCnt();
var rowContentHeights = []; // content height for each row
var segmentRows = buildSegmentRows(segments); // an array of segment arrays, one for each row
var colI;
for (var rowI=0; rowI<rowCnt; rowI++) {
var segmentRow = segmentRows[rowI];
@@ -394,7 +394,7 @@ function DayEventRenderer() {
// an array of running total heights for each column.
// initialize with all zeros.
var colHeights = [];
for (var colI=0; colI<colCnt; colI++) {
for (colI=0; colI<colCnt; colI++) {
colHeights.push(0);
}
@@ -412,7 +412,7 @@ function DayEventRenderer() {
);
// adjust the columns to account for the segment's height
for (var colI=segment.leftCol; colI<=segment.rightCol; colI++) {
for (colI=segment.leftCol; colI<=segment.rightCol; colI++) {
colHeights[colI] = segment.top + segment.outerHeight;
}
}
@@ -643,8 +643,6 @@ function DayEventRenderer() {
}
isResizing = true;
var hoverListener = getHoverListener();
var rowCnt = getRowCnt();
var colCnt = getColCnt();
var elementTop = element.css('top');
var dayDelta;
var eventEnd;
@@ -763,6 +761,6 @@ function compareDaySegments(a, b) {
return (b.rightCol - b.leftCol) - (a.rightCol - a.leftCol) || // put wider events first
b.event.allDay - a.event.allDay || // if tie, put all-day events first (booleans cast to 0/1)
a.event.start - b.event.start || // if a tie, sort by event start date
(a.event.title || '').localeCompare(b.event.title) // if a tie, sort by event title
(a.event.title || '').localeCompare(b.event.title); // if a tie, sort by event title
}
src/common/HorizontalPositionCache.js
+3 -3
View File
@@ -7,15 +7,15 @@ function HorizontalPositionCache(getElement) {
rights = {};
function e(i) {
return elements[i] = elements[i] || getElement(i);
return (elements[i] = (elements[i] || getElement(i)));
}
t.left = function(i) {
return lefts[i] = lefts[i] === undefined ? e(i).position().left : lefts[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];
return (rights[i] = (rights[i] === undefined ? t.left(i) + e(i).width() : rights[i]));
};
t.clear = function() {
src/common/HoverListener.js
+4 -1
View File
@@ -22,7 +22,10 @@ function HoverListener(coordinateGrid) {
function mouse(ev) {
_fixUIEvent(ev); // see below
var newCell = coordinateGrid.cell(ev.pageX, ev.pageY);
if (!newCell != !cell || newCell && (newCell.row != cell.row || newCell.col != cell.col)) {
if (
Boolean(newCell) !== Boolean(cell) ||
newCell && (newCell.row != cell.row || newCell.col != cell.col)
) {
if (newCell) {
if (!firstCell) {
firstCell = newCell;
src/common/OverlayManager.js
+1 -1
View File
@@ -28,7 +28,7 @@ function OverlayManager() {
function clearOverlays() {
var e;
while (e = usedOverlays.shift()) {
while ((e = usedOverlays.shift())) {
unusedOverlays.push(e.hide().unbind());
}
}
src/common/SelectionManager.js
-1
View File
@@ -79,7 +79,6 @@ function SelectionManager() {
if (ev.which == 1 && opt('selectable')) { // which==1 means left mouse button
unselect(ev);
var _mousedownElement = this;
var dates;
hoverListener.start(function(cell, origCell) { // TODO: maybe put cellToDate/getIsCellAllDay info in cell
clearSelection();
src/common/View.js
+8 -9
View File
@@ -28,7 +28,6 @@ function View(element, calendar, viewName) {
// imports
var reportEventChange = calendar.reportEventChange;
var getEventEnd = calendar.getEventEnd;
// locals
@@ -529,11 +528,11 @@ function View(element, calendar, viewName) {
function cellOffsetToDayOffset(cellOffset) {
var day0 = t.start.day(); // first date's day of week
cellOffset += dayToCellMap[day0]; // normlize cellOffset to beginning-of-week
return Math.floor(cellOffset / cellsPerWeek) * 7 // # of days from full weeks
+ cellToDayMap[ // # of days from partial last week
return Math.floor(cellOffset / cellsPerWeek) * 7 + // # of days from full weeks
cellToDayMap[ // # of days from partial last week
(cellOffset % cellsPerWeek + cellsPerWeek) % cellsPerWeek // crazy math to handle negative cellOffsets
]
- day0; // adjustment for beginning-of-week normalization
] -
day0; // adjustment for beginning-of-week normalization
}
// day offset -> date
@@ -563,11 +562,11 @@ function View(element, calendar, viewName) {
function dayOffsetToCellOffset(dayOffset) {
var day0 = t.start.day(); // first date's day of week
dayOffset += day0; // normalize dayOffset to beginning-of-week
return Math.floor(dayOffset / 7) * cellsPerWeek // # of cells from full weeks
+ dayToCellMap[ // # of cells from partial last week
return Math.floor(dayOffset / 7) * cellsPerWeek + // # of cells from full weeks
dayToCellMap[ // # of cells from partial last week
(dayOffset % 7 + 7) % 7 // crazy math to handle negative dayOffsets
]
- dayToCellMap[day0]; // adjustment for beginning-of-week normalization
] -
dayToCellMap[day0]; // adjustment for beginning-of-week normalization
}
// cell offset -> cell (object with row & col keys)