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

Browse Source
This commit is contained in:
sean kenny
2014-08-18 15:44:30 +01:00
parent 46425099b1 2586270d27
commit 28cde132b0
5 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/fullcalendar.js
Vendored
+21 -9
View File
@@ -6833,10 +6833,16 @@ function ResourceEventRenderer() {
function eventsForResource(resource, events) {
var resourceEvents = [];
var hasResource = function(event) {
return event.resources && $.grep(event.resources, function(id) {
return id == resource.id;
}).length;
};
for (var i = 0; i < events.length; i++) {
if (events[i].resources && $.grep(events[i].resources, function(id) { return id == resource.id; }).length) {
resourceEvents.push(events[i]);
}
if (hasResource(events[i])) {
resourceEvents.push(events[i]);
}
}
return resourceEvents;
}
@@ -8119,13 +8125,19 @@ function DayEventRenderer() {
function eventsForResource(resource, events) {
var resourceEvents = [];
var hasResource = function(event) {
return event.resources && $.grep(event.resources, function(id) {
return id == resource.id;
}).length;
};
for (var i = 0; i < events.length; i++) {
if (events[i].resources && $.grep(events[i].resources, function(id) { return id == resource.id; }).length) {
resourceEvents.push(events[i]);
}
}
return resourceEvents;
}
if (hasResource(events[i])) {
resourceEvents.push(events[i]);
}
}
return resourceEvents;
}
// Generate an array of segments for a single event.
// A "segment" is the same data structure that View.rangeToSegments produces,
dist/fullcalendar.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
dist/lang-all.js
Vendored
+1 -3
View File
File diff suppressed because one or more lines are too long
src/common/DayEventRenderer.js
+12 -6
View File
@@ -191,13 +191,19 @@ function DayEventRenderer() {
function eventsForResource(resource, events) {
var resourceEvents = [];
var hasResource = function(event) {
return event.resources && $.grep(event.resources, function(id) {
return id == resource.id;
}).length;
};
for (var i = 0; i < events.length; i++) {
if (events[i].resources && $.grep(events[i].resources, function(id) { return id == resource.id; }).length) {
resourceEvents.push(events[i]);
}
}
return resourceEvents;
}
if (hasResource(events[i])) {
resourceEvents.push(events[i]);
}
}
return resourceEvents;
}
// Generate an array of segments for a single event.
// A "segment" is the same data structure that View.rangeToSegments produces,
src/resource/ResourceEventRenderer.js
+9 -3
View File
@@ -169,10 +169,16 @@ function ResourceEventRenderer() {
function eventsForResource(resource, events) {
var resourceEvents = [];
var hasResource = function(event) {
return event.resources && $.grep(event.resources, function(id) {
return id == resource.id;
}).length;
};
for (var i = 0; i < events.length; i++) {
if (events[i].resources && $.grep(events[i].resources, function(id) { return id == resource.id; }).length) {
resourceEvents.push(events[i]);
}
if (hasResource(events[i])) {
resourceEvents.push(events[i]);
}
}
return resourceEvents;
}