Changeset 6754 for branches/2.4/prototype/modules/calendar/js/calendar.codecs.js

Timestamp:

07/11/12 11:45:10 (12 years ago)

Author:

niltonneto

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.1.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• prototype/modules/calendar/js/calendar.codecs.js (modified) (7 diffs)

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

@@ -349 +349 @@
             return {
                 participant : meAttendee(form.attendee), 
-                startTime: Date.parseExact(form.startDate + " "+$.trim(form.startHour) , formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'), 
-                endTime:  Date.parseExact(form.endDate + " "+$.trim(form.endHour), formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'), 
+                startTime: Date.parseExact(form.startDate + " "+$.trim(form.startHour) , formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'),
+                endTime:  Date.parseExact(form.endDate + " "+$.trim(form.endHour), formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'),
                 allDay: ( !!form.allDay ? 1 : 0 ),
                 schedulable: form.idEvent
@@ -499 +499 @@
 
             var isShared = !objEvent.id ? false : (!!objEvent.calendar) && parseInt(Calendar.signatureOf[objEvent.calendar].isOwner) ? false : true;
-            var limitAttendee = false; 
+            var limitAttendee = false;
 
             return {
@@ -587 +587 @@
                 me: me,
                 delegatedFrom: delegatedFrom,
-                statusParticipants: (objEvent.sizeAttendees != "") ? objEvent.statusAttendees : statusParticipants, 
-                sizeAttendeeLimit: (objEvent.sizeAttendees != "") ? objEvent.sizeAttendees : false 
+                statusParticipants: (objEvent.sizeAttendees != "") ? objEvent.statusAttendees : statusParticipants,
+                sizeAttendeeLimit: (objEvent.sizeAttendees != "") ? objEvent.sizeAttendees : false
             };
         });
@@ -641 +641 @@
     patati['byday'] = day.join(',');
 
-    var formatString = User.preferences.dateFormat + " " + User.preferences.hourFormat; 
-  
-    var date = Date.parseExact( form.startDate + " "+$.trim(form.startHour) , formatString ) 
-             
+    var formatString = User.preferences.dateFormat + " " + User.preferences.hourFormat;
+
+    var date = Date.parseExact( form.startDate + " "+$.trim(form.startHour) , formatString )
+    
     patati['startTime'] = date.toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00');
-
+        
     if( !patati['byday'] )
         switch(form.frequency) {
@@ -657 +657 @@
                 break;
             case 'yearly':
-                patati['byyearday'] = (1 + date.getDayOfYear()); 
+                patati['byyearday'] = (1 + date.getDayOfYear());
                 break;
             default :
@@ -667 +667 @@
         
     if (($(".endRepeat").val() == 'customDate'))
-        patati['endTime'] = Date.parseExact( $(".customDateEnd").val() + (" "+$.trim(form.endHour)) , formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'); 
-   
- patati['interval']  = $(".eventInterval").val();
+        patati['endTime'] = Date.parseExact( $(".customDateEnd").val() + (" "+$.trim(form.endHour)) , formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00');
+        
+    patati['interval']  = $(".eventInterval").val();
 
     /**
@@ -722 +722 @@
             return DataLayer.merge({
                 "class": form["class"],
-                startTime: Date.parseExact(form.startDate + " "+$.trim(form.startHour) , formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'), 
-                endTime:  Date.parseExact(form.endDate + " "+$.trim(form.endHour), formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'),  //+ (!!form.allDay ? 86400000 : 0) , 
+                startTime: Date.parseExact(form.startDate + " "+$.trim(form.startHour) , formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'),
+                endTime:  Date.parseExact(form.endDate + " "+$.trim(form.endHour), formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'),  //+ (!!form.allDay ? 86400000 : 0) ,
                 allDay: ( !!form.allDay ? 1 : 0 ),       
                 id: form.idEvent,