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

Cleaning some grun lint issues

Browse Source
This commit is contained in:
sean kenny
2014-08-09 15:58:51 +01:00
parent 3ecbfb09d0
commit 2ab197bf3a
4 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/DayEventRenderer.js
+6 -5
View File
@@ -168,18 +168,19 @@ function DayEventRenderer() {
function buildSegments(events) {
var resources = t.getResources;
var segments = [];
var i, eventSegments;
if (typeof resources === 'undefined'){
for (var i=0; i<events.length; i++) {
var eventSegments = buildSegmentsForEvent(events[i]);
for (i=0; i<events.length; i++) {
eventSegments = buildSegmentsForEvent(events[i]);
segments.push.apply(segments, eventSegments); // append an array to an array
}
} else {
for (var i=0; i<resources().length; i++) {
for (i=0; i<resources().length; i++) {
var resourceEvents = eventsForResource(resources()[i], events);
for (var j=0; j<resourceEvents.length; j++) {
var eventSegments = buildSegmentsForEvent(resourceEvents[j], i);
eventSegments = buildSegmentsForEvent(resourceEvents[j], i);
segments.push.apply(segments, eventSegments); // append an array to an array
}
@@ -192,7 +193,7 @@ function DayEventRenderer() {
var resourceEvents = [];
for (var i = 0; i < events.length; i++) {
if (events[i].resources && $.inArray(resource.id, events[i].resources) >= 0) {
resourceEvents.push(events[i])
resourceEvents.push(events[i]);
}
}
return resourceEvents;
src/resource/ResourceEventRenderer.js
+1 -1
View File
@@ -310,7 +310,7 @@ function ResourceEventRenderer() {
// set all positions/dimensions at once
for (i=0; i<segCnt; i++) {
seg = segs[i];
if (eventElement = seg.element) {
if ((eventElement = seg.element)) {
eventElement[0].style.width = Math.max(0, seg.outerWidth - seg.hsides) + 'px';
height = Math.max(0, seg.outerHeight - seg.vsides);
eventElement[0].style.height = height + 'px';
src/resource/ResourceView.js
+1 -1
View File
@@ -465,7 +465,7 @@ function ResourceView(element, calendar, viewName) {
for (col=0; col<colCnt; col++) {
var resource = resources()[col];
var classNames = [ // added
var classNames = [ // added
'fc-col' + col,
resource.className,
headerClass
tests/resourceDayView.html
+19 -19
View File
@@ -115,26 +115,26 @@
defaultView: 'resourceDay',
resources: [
{ 'id': 'resource1', 'name': 'Resource 1', 'className': 'css-class-as-string' },
{ 'id': 'resource2', 'name': 'Resource 2', 'className': ['green', 'another-css-class-name'] }],
//{ 'id': 'resource3', 'name': 'Resource 3' }],
{ 'id': 'resource2', 'name': 'Resource 2', 'className': ['green', 'another-css-class-name'] },
{ 'id': 'resource3', 'name': 'Resource 3' }],
events: [
// {
// title: 'R1: All day',
// allDay: true,
// resources: 'resource1'
// },
// {
// title: 'R2: All Day',
// allDay: true,
// resources: 'resource2'
// },
// {
// title: 'R1/R2: 12-14',
// start: new Date(y, m, d, 12, 0),
// end: new Date(y, m, d, 14, 0),
// allDay: false,
// resources: ['resource1', 'resource2']
// },
{
title: 'R1: All day',
allDay: true,
resources: 'resource1'
},
{
title: 'R2: All Day',
allDay: true,
resources: 'resource2'
},
{
title: 'R1/R2: 12-14',
start: new Date(y, m, d, 12, 0),
end: new Date(y, m, d, 14, 0),
allDay: false,
resources: ['resource1', 'resource2']
},
{
title: 'R1: 14:30-16',
start: new Date(y, m, d, 14, 30),