Changeset 8051 for branches/2.5/prototype/modules/calendar/js
- Timestamp:
- 03/20/13 18:20:03 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.5/prototype/modules/calendar/js/calendar.codecs.js
r8037 r8051 632 632 startDate: Timezone.getDate( (objEvent.DayLigth ? objEvent.DayLigth.event.startTime : objEvent.startTime), 'start', objEvent.allDay , true), 633 633 startHour: objEvent.DayLigth ? Timezone.getHour( objEvent.DayLigth.event.startTime) : Timezone.formateHour( objEvent.startTime ), 634 startUnixTime: objEvent.DayLigth ? objEvent.DayLigth.event.startTime : objEvent.startTime, 634 635 endDate: Timezone.getDate( (objEvent.DayLigth ? objEvent.DayLigth.event.endTime : objEvent.endTime), 'end', objEvent.allDay , true), 635 636 endHour: objEvent.DayLigth ? Timezone.getHour( objEvent.DayLigth.event.endTime) : Timezone.formateHour( objEvent.endTime ), … … 839 840 description: objEvent.description, 840 841 timezone: objEvent.timezone, 842 startUnixTime: objEvent.startTime, 841 843 timezones: Timezone.timezones, 842 844 percentage: (objEvent.percentage) ? objEvent.percentage : '0', … … 1215 1217 percentage: (objEvent.percentage) ? objEvent.percentage : '0', 1216 1218 priority: objEvent.priority, 1219 startUnixTime: objEvent.startTime, 1217 1220 startDate: new Date( parseInt(objEvent.startTime) ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ), 1218 1221 startHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(objEvent.startTime)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'startTime'), User.preferences.hourFormat), … … 1634 1637 } 1635 1638 1639 var orderByStartUnixTime = function( a , b ) 1640 { 1641 return parseInt(a.startUnixTime) > parseInt(b.startUnixTime); 1642 } 1643 1636 1644 for (var i=0; i < res.length; i++) { 1637 1645 … … 1646 1654 var duration = parseInt( endDate.getTime() ) - parseInt( startDate.getTime() ); 1647 1655 1648 var occurrences = [ startDate.getTime()];1656 var occurrences = [ res[i].startUnixTime ]; 1649 1657 1650 1658 if( res[i].occurrences ) … … 1663 1671 }); 1664 1672 1673 res2.startUnixTime = parseInt(occurrences[ii]); 1674 1665 1675 if(res[i].repeat) 1666 1676 res2.repeat = typeRepeat[res[i].repeat.frequency]; … … 1673 1683 1674 1684 dates[index].events.push(res2); 1685 1686 dates[index].events = dates[index].events.sort(orderByStartUnixTime); 1675 1687 1676 1688 }
Note: See TracChangeset
for help on using the changeset viewer.