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 branch 'resourceView' of https://github.com/KirkeWeb/fullcalendar into v2

Browse Source
This commit is contained in:
sean kenny
2014-08-21 12:34:17 +01:00
parent fae8c2b49a 966664ebc0
commit 307853d3ba
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/fullcalendar.js
Vendored
+5 -2
View File
@@ -6069,16 +6069,18 @@ function ResourceView(element, calendar, viewName) {
cellsHTML = '';
for (col=0; col<colCnt; col++) {
for (col=0; col<(colCnt||1); col++) {
var resource = resources()[col];
date = t.intervalStart.clone();
classNames = [
'fc-col' + col,
'fc-' + dayIDs[date.day()],
resource.className,
contentClass
];
if (resource && resource.className) {
classNames.push(resource.className);
}
if (date.isSame(today, 'day')) {
classNames.push(
tm + '-state-highlight',
@@ -6665,6 +6667,7 @@ function ResourceView(element, calendar, viewName) {
}
}
;;
function ResourceEventRenderer() {
dist/fullcalendar.min.js
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
src/resource/ResourceView.js
+4 -2
View File
@@ -383,16 +383,18 @@ function ResourceView(element, calendar, viewName) {
cellsHTML = '';
for (col=0; col<colCnt; col++) {
for (col=0; col<(colCnt||1); col++) {
var resource = resources()[col];
date = t.intervalStart.clone();
classNames = [
'fc-col' + col,
'fc-' + dayIDs[date.day()],
resource.className,
contentClass
];
if (resource && resource.className) {
classNames.push(resource.className);
}
if (date.isSame(today, 'day')) {
classNames.push(
tm + '-state-highlight',