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-15 12:42:05 +01:00
parent 4775966848 25f8e0c1b0
commit 46425099b1
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/fullcalendar.js
Vendored
+2 -2
View File
@@ -6834,7 +6834,7 @@ function ResourceEventRenderer() {
function eventsForResource(resource, events) {
var resourceEvents = [];
for (var i = 0; i < events.length; i++) {
if (events[i].resources && $.inArray(resource.id, events[i].resources) >= 0) {
if (events[i].resources && $.grep(events[i].resources, function(id) { return id == resource.id; }).length) {
resourceEvents.push(events[i]);
}
}
@@ -8120,7 +8120,7 @@ function DayEventRenderer() {
function eventsForResource(resource, events) {
var resourceEvents = [];
for (var i = 0; i < events.length; i++) {
if (events[i].resources && $.inArray(resource.id, events[i].resources) >= 0) {
if (events[i].resources && $.grep(events[i].resources, function(id) { return id == resource.id; }).length) {
resourceEvents.push(events[i]);
}
}
dist/fullcalendar.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
src/common/DayEventRenderer.js
+1 -1
View File
@@ -192,7 +192,7 @@ function DayEventRenderer() {
function eventsForResource(resource, events) {
var resourceEvents = [];
for (var i = 0; i < events.length; i++) {
if (events[i].resources && $.inArray(resource.id, events[i].resources) >= 0) {
if (events[i].resources && $.grep(events[i].resources, function(id) { return id == resource.id; }).length) {
resourceEvents.push(events[i]);
}
}
src/resource/ResourceEventRenderer.js
+1 -1
View File
@@ -170,7 +170,7 @@ function ResourceEventRenderer() {
function eventsForResource(resource, events) {
var resourceEvents = [];
for (var i = 0; i < events.length; i++) {
if (events[i].resources && $.inArray(resource.id, events[i].resources) >= 0) {
if (events[i].resources && $.grep(events[i].resources, function(id) { return id == resource.id; }).length) {
resourceEvents.push(events[i]);
}
}