Changeset 6453 for branches/2.4/prototype/modules/calendar/js/init.js

Timestamp:

06/08/12 17:22:36 (12 years ago)

Author:

eduardow

Message:

Ticket #2846 - Melhorias e inconsistências gerais no modulo Expresso Calendar.

File:

• branches/2.4/prototype/modules/calendar/js/init.js (modified) (1 diff)

branches/2.4/prototype/modules/calendar/js/init.js

@@ -137 +137 @@
       -----------------------------------------------------------------*/
                 $(".button.add.add-event").click(function(event){
-                        var startEvent = new Date();  
-                        if(startEvent.toString('mm') < 30) 
-                                        startEvent.add({minutes: (30 - parseInt(startEvent.toString('mm')))}); 
-                        else 
-                                        startEvent.add({hours: 1, minutes: '-'+startEvent.toString('mm')}); 
-                        var endEvent = function(date){ 
-                                        if(!!User.preferences.defaultCalendar){ 
-                                                        return  parseInt(date.getTime()) + 
-                                                                (       !!Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration ?  
-                                                                        (Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration * 60000) :
-                                                                        (User.preferences.defaultDuration * 60000)
-                                                                );
-                                        }else 
-                                                        return parseInt(date.getTime()) + (User.preferences.defaultDuration * 60000); 
-                        };       
-                        
+                        var startEvent = new Date();
+                        var configData = (startEvent.toString('mm') < 30)  ? {minutes: (30 - parseInt(startEvent.toString('mm')))} : {hours: 1, minutes: '-'+startEvent.toString('mm')};
+                        startEvent.add(configData); 
+
                         eventDetails({ 
                                 startTime: startEvent.getTime(),
-                                endTime: endEvent(startEvent)
+                                endTime: dateCalendar.decodeRange(startEvent, (!!User.preferences.defaultCalendar ? (   !!Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration ?  
+                                                (Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration) : (User.preferences.defaultDuration)) : (User.preferences.defaultDuration)))
                         }, true );
                 });