Changeset 8004 for branches


Ignore:
Timestamp:
03/12/13 16:32:44 (6 years ago)
Author:
douglas
Message:

Ticket #3387 - Ao criar um novo compromisso com o botão Adicionar evento

Location:
branches/2.5/prototype/modules/calendar/js
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.5/prototype/modules/calendar/js/calendar.codecs.js

    r7982 r8004  
    629629                timezone: objEvent.timezone, 
    630630                timezones: Timezone.timezones, 
    631                 startDate: Timezone.getDate( (objEvent.DayLigth ? objEvent.DayLigth.event.startTime : objEvent.startTime), 'start', objEvent.allDay ), 
     631                startDate: Timezone.getDate( (objEvent.DayLigth ? objEvent.DayLigth.event.startTime : objEvent.startTime), 'start', objEvent.allDay , true), 
    632632        startHour: objEvent.DayLigth ? Timezone.getHour( objEvent.DayLigth.event.startTime) : Timezone.formateHour( objEvent.startTime ), 
    633         endDate: Timezone.getDate( (objEvent.DayLigth ? objEvent.DayLigth.event.endTime : objEvent.endTime), 'end', objEvent.allDay ), 
     633        endDate: Timezone.getDate( (objEvent.DayLigth ? objEvent.DayLigth.event.endTime : objEvent.endTime), 'end', objEvent.allDay , true), 
    634634                endHour: objEvent.DayLigth ? Timezone.getHour( objEvent.DayLigth.event.endTime) : Timezone.formateHour( objEvent.endTime ), 
    635635                allDay: !!parseInt( objEvent.allDay ), 
  • branches/2.5/prototype/modules/calendar/js/timezone.js

    r7680 r8004  
    7878    }, 
    7979 
    80     getDate: function( time, rang, isAllDay){ 
     80    getDate: function( time, rang, isAllDay , notNormalize){ 
    8181 
    82         return  Timezone.normalizeDate(new Date( parseInt( time ) - ((rang == 'end' && isAllDay && parseInt(isAllDay) == 1) ? 86400000 : 0)), false, true).toString( User.preferences.dateFormat ); 
     82        return  (notNormalize && !isAllDay) ? new Date( parseInt( time ) - ((rang == 'end' && isAllDay && parseInt(isAllDay) == 1) ? 86400000 : 0)).toString( User.preferences.dateFormat ) : Timezone.normalizeDate(new Date( parseInt( time ) - ((rang == 'end' && isAllDay && parseInt(isAllDay) == 1) ? 86400000 : 0)), false, true).toString( User.preferences.dateFormat ); 
    8383 
    8484    }, 
Note: See TracChangeset for help on using the changeset viewer.