Changeset 5468

Timestamp:

02/02/12 15:18:40 (12 years ago)

Author:

acoutinho

Message:

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

Location:

trunk/prototype/modules/calendar

Files:

• js/calendar.codecs.js (modified) (1 diff)
• js/timezone.js (modified) (1 diff)
• templates/index.ejs (modified) (1 diff)

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -5 +5 @@
                 this.me = DataLayer.dispatch( "me" );
                 
-                var objTime = DataLayer.dispatch( "timezones" );
-                this.timezones = objTime.timezones;
-                this.isDaylightSaving = objTime.isDaylightSaving;
+                
+                this.timezones = Timezone.timezones;
+                this.isDaylightSaving = Timezone.daylightSaving;
                 this.load();      
     },

trunk/prototype/modules/calendar/js/timezone.js

@@ -4 +4 @@
         Objeto Date.getTime() retorna a data sem inserção do offset
 */
+
+var objTime = DataLayer.dispatch( "timezones" );
 Timezone = {
   
-        daylightSaving: parseInt( User.isDaylightSaving ),
+        daylightSaving: parseInt( objTime.isDaylightSaving ),
 
-        timezones: User.timezones,
-
-        defaultTimezone: User.preferences.timezone,
-          
+        timezones: objTime.timezones,     
         timezone: function( tzId ){
 
-                return this.timezones[ tzId || this.defaultTimezone ];
+                return this.timezones[ tzId || User.preferences.timezone ];
 
         },

trunk/prototype/modules/calendar/templates/index.ejs

@@ -84 +84 @@
 
 <script type='text/javascript' src='<?= MODULESURL ?>/js/helpers.js'></script>
+<script type='text/javascript' src='<?= MODULESURL ?>/js/timezone.js'></script>
 <script type='text/javascript' src='<?= MODULESURL ?>/js/calendar.codecs.js'></script>
-<script type='text/javascript' src='<?= MODULESURL ?>/js/timezone.js'></script>
+
 <script type='text/javascript' src='<?= MODULESURL ?>/js/I18n.js'></script>
 <script type="text/javascript" src="<?= MODULESURL ?>/js/init.js"></script>