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

allow for current (ongoing) events

Browse source
This commit is contained in:
rolux 2011-05-26 20:18:20 +02:00
commit 385aac008c
3 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,11 +73,18 @@ Ox.Calendar = function(options, self) {
});
self.options.events.forEach(function(event) {
if (!event.end) {
event.end = Ox.formatDate(new Date(), '%Y-%m-%d');
event.current = true;
}
event.id = Ox.isUndefined(event.id) ? Ox.uid() : event.id;
event.startTime = Ox.parseDate(event.start, true);
event.endTime = Ox.parseDate(event.end, true);
event.rangeText = Ox.formatDateRange(event.start, event.end, true);
event.durationText = Ox.formatDateRangeDuration(event.start, event.end, true);
if (event.current) {
event.rangeText = event.rangeText.split(' - ').shift() + ' - ...';
}
});
self.maxZoom = 32;
@ -554,6 +561,7 @@ Ox.Calendar = function(options, self) {
return new Ox.Element()
.addClass('OxEvent' +
(event.type ? ' Ox' + Ox.toTitleCase(event.type) : '' ) +
(event.current ? ' OxCurrent' : '') +
(event.id == self.options.selected ? ' OxSelected' : '')
)
.css({