diff --git a/fullcalendar.jquery.json b/fullcalendar.jquery.json index e1726ec..7eb2fa7 100644 --- a/fullcalendar.jquery.json +++ b/fullcalendar.jquery.json @@ -9,26 +9,26 @@ }, "title": "FullCalendar", - "description": "Full-sized drag & drop event calendar", - "keywords": [ "calendar", "event", "full-sized" ], + "description": "Full-sized drag & drop event calendar with resource views", + "keywords": [ "calendar", "event", "full-sized", "Resources" ], "homepage": "http://arshaw.com/fullcalendar/", - "demo": "http://arshaw.com/fullcalendar/", + "demo": "", "docs": "http://arshaw.com/fullcalendar/docs/", - "download": "http://arshaw.com/fullcalendar/download/", - "bugs": "http://code.google.com/p/fullcalendar/issues/list", + "download": "", + "bugs": "https://github.com/seankenny/fullcalendar/issues", "licenses": [ { "type": "MIT", - "url": "https://github.com/arshaw/fullcalendar/blob/master/license.txt" + "url": "https://github.com/seankenny/fullcalendar/blob/master/license.txt" } ], "author": { - "name": "Adam Shaw", - "email": "arshaw@arshaw.com", - "url": "http://arshaw.com/" + "name": "Adam Shaw, Sean Kenny", + "email": "srkenny@gmail.com", + "url": "http://seankenny.me/" }, - "copyright": "2013 Adam Shaw" + "copyright": "2013 Adam Shaw, Sean Kenny - resource view" } \ No newline at end of file diff --git a/license.txt b/license.txt index dd7b48e..a7558e5 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,5 @@ Copyright (c) 2013 Adam Shaw +Copyright (c) 2013 Sean Kenny Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/src/common/View.js b/src/common/View.js index a125bdc..1ee5fe2 100644 --- a/src/common/View.js +++ b/src/common/View.js @@ -484,7 +484,9 @@ function View(element, calendar, viewName) { // function rangeToSegments(startDate, endDate) { var rowCnt = t.getRowCnt(); - var colCnt = t.getColCnt(); + + // HAAAACK! Can't really think of a way yet to get this working. + var colCnt = t.name === 'resourceDay' ? 1 : t.getColCnt(); var segments = []; // array of segments to return // day offset for given date range diff --git a/src/resource/ResourceEventRenderer.js b/src/resource/ResourceEventRenderer.js index fcc0a60..784a0ba 100644 --- a/src/resource/ResourceEventRenderer.js +++ b/src/resource/ResourceEventRenderer.js @@ -89,7 +89,7 @@ function ResourceEventRenderer() { minMinute = getMinMinute(), maxMinute = getMaxMinute(), d, - visEventEnds = $.map(events, slotEventEnd), + visEventEnds, i, col, j, level, k, seg, @@ -100,6 +100,7 @@ function ResourceEventRenderer() { addMinutes(d, minMinute); var resourceEvents = eventsForResource(resources[i], events); + visEventEnds = $.map(resourceEvents, slotEventEnd); col = stackAgendaSegs( sliceSegs( resourceEvents,