Changeset 5468


Ignore:
Timestamp:
02/02/12 15:18:40 (11 years ago)
Author:
acoutinho
Message:

Ticket #2434 - Correção de bugs no expresso email

Location:
trunk/prototype/modules/calendar
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/prototype/modules/calendar/js/calendar.codecs.js

    r5442 r5468  
    55                this.me = DataLayer.dispatch( "me" ); 
    66                 
    7                 var objTime = DataLayer.dispatch( "timezones" ); 
    8                 this.timezones = objTime.timezones; 
    9                 this.isDaylightSaving = objTime.isDaylightSaving; 
     7                 
     8                this.timezones = Timezone.timezones; 
     9                this.isDaylightSaving = Timezone.daylightSaving; 
    1010                this.load();       
    1111    }, 
  • trunk/prototype/modules/calendar/js/timezone.js

    r5409 r5468  
    44        Objeto Date.getTime() retorna a data sem inserção do offset 
    55*/ 
     6 
     7var objTime = DataLayer.dispatch( "timezones" ); 
    68Timezone = { 
    79   
    8         daylightSaving: parseInt( User.isDaylightSaving ), 
     10        daylightSaving: parseInt( objTime.isDaylightSaving ), 
    911 
    10         timezones: User.timezones, 
    11  
    12         defaultTimezone: User.preferences.timezone, 
    13            
     12        timezones: objTime.timezones,      
    1413        timezone: function( tzId ){ 
    1514 
    16                 return this.timezones[ tzId || this.defaultTimezone ]; 
     15                return this.timezones[ tzId || User.preferences.timezone ]; 
    1716 
    1817        }, 
  • trunk/prototype/modules/calendar/templates/index.ejs

    r5409 r5468  
    8484 
    8585<script type='text/javascript' src='<?= MODULESURL ?>/js/helpers.js'></script> 
     86<script type='text/javascript' src='<?= MODULESURL ?>/js/timezone.js'></script> 
    8687<script type='text/javascript' src='<?= MODULESURL ?>/js/calendar.codecs.js'></script> 
    87 <script type='text/javascript' src='<?= MODULESURL ?>/js/timezone.js'></script> 
     88 
    8889<script type='text/javascript' src='<?= MODULESURL ?>/js/I18n.js'></script> 
    8990<script type="text/javascript" src="<?= MODULESURL ?>/js/init.js"></script> 
Note: See TracChangeset for help on using the changeset viewer.