Changeset 5641 for trunk/prototype/modules/calendar/js

Timestamp:

03/06/12 14:28:15 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correcao de bugs e melhorias no modulo expressoCalendar

Location:

trunk/prototype/modules/calendar/js

Files:

• calendar.codecs.js (modified) (1 diff)
• helpers.js (modified) (4 diffs)

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

@@ -263 +263 @@
     if( status === 'serverclient' ){
                 DataLayer.commit( false, false, function(){     
-                        if(!!$('#calendar').fullCalendar){
+                        if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') == 0){
                                 Calendar.rerenderView(true);
                                 contentMenu();
-                        }
-                        //Atualiza a listagem de eventos apenas se estiver na aba de listagem
-                        if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') != 0)
+                        }else if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') != 0)
                                 pageselectCallback($('.events-list-win.active [name=keyword]').val(), 0);
-                        
                 });
     }

trunk/prototype/modules/calendar/js/helpers.js

@@ -263 +263 @@
                         }else{
                                 checked = true;
-                                $(this).parents('li').find('.button.edit').click();
+                                        $(this).parents('li').find('.button.edit').click();
                         }
                 }).removeClass('new');
@@ -592 +592 @@
                         */
                         var hasNewAttendee = false;
+                        
+                        blkAddAtendee.find('.attendee-list-add .add-attendee-input span').click(function(data){
+                                blkAddAtendee.find('.attendee-list-add .add-attendee-input input').keydown();
+                        });
+                        
                         blkAddAtendee.find('.attendee-list-add .add-attendee-input input').keydown(function(event) {
                                 
-                                if (event.keyCode == '13' && $(this).val() != '') {
+                                if (event.keyCode == '13' && $(this).val() != '' || (event.keyCode == undefined && $(this).val() != '')) {
                                         Encoder.EncodeType = "entity";
                                         $(this).val(Encoder.htmlEncode($(this).val()));
@@ -621 +626 @@
 
                                         var user = DataLayer.get('user', ["=", "mail", $(this).val()]);
-                                        if(user[0].id)
+                                        if(!!user && user[0].id)
                                                 attendees[user[0].id].name  = user[0].name;
                                         
@@ -1840 +1845 @@
                            break;  
                         }
-   return {filter: ['AND', ['>=', 'rangeStart', rangeStart], ['<=', 'rangeEnd', rangeEnd] , ['IN', 'calendar',  calerdars_selecteds]], criteria: {deepness: 2, order: 'startTime'}}; 
+                        
+        var timezone = {};
+                for(var i in Calendar.signatureOf)
+                        timezone[i] = Calendar.signatureOf[i].calendar.timezone;                
+        
+   return {filter: ['AND', ['>=', 'rangeStart', rangeStart], ['<=', 'rangeEnd', rangeEnd] , ['IN', 'calendar',  calerdars_selecteds]], criteria: {deepness: 2, order: 'startTime', timezones: timezone}}; 
 
 }