sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

add more data to calendar demo

Browse source
This commit is contained in:
rolux 2011-05-27 18:03:05 +02:00
commit 8ed96c83ca
2 changed files with 201 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
source/Ox.UI/js/Calendar/Ox.Calendar.js
View file

@ -835,12 +835,11 @@ Ox.Calendar = function(options, self) {
return 1;
} else if (a.type != 'person' && b.type == 'person') {
return -1;
/*
} else if (a.startTime < b.startTime || a.startTime > b.startTime) {
return a.startTime - b.startTime;
*/
} else {
///*
} else if ((b.endTime - b.startTime) != (a.endTime - a.startTime)) {
return (b.endTime - b.startTime) - (a.endTime - a.startTime);
} else /*if (a.startTime < b.startTime || a.startTime > b.startTime)*/ {
return a.startTime - b.startTime;
}
}).forEach(function(event, i) {
var line = lineEvents.length;