Changeset 5442 for trunk/prototype/modules/calendar/js/init.js

Timestamp:

01/27/12 19:25:06 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correção de bugs e melhorias

File:

• trunk/prototype/modules/calendar/js/init.js (modified) (3 diffs)

trunk/prototype/modules/calendar/js/init.js

@@ -56 +56 @@
                         {       
                                 $tabs.tabs("select", "#calendar");
-                                $('#calendar').fullCalendar('gotoDate',$(this).siblings('span').html(), Date.getMonthNumberFromName($(this).html() == 'Março' ? 'Mar' : $(this).html()),'01');
+                                var toDate = $('.block-vertical-toolbox .mini-calendar').datepicker("getDate").toString('yyyy-MM-dd').split('-');
+                                $('#calendar').fullCalendar('gotoDate', toDate[0], parseInt(toDate[1]-1), toDate[2] );
                                 $('#calendar').fullCalendar( 'changeView', 'agendaDay' );
                         }                       
@@ -66 +67 @@
                 $('.ui-datepicker-title .ui-datepicker-month').live('click',function(){
                         $tabs.tabs("select", "#calendar");
-                        $('#calendar').fullCalendar('gotoDate',$(this).html(), '0', '01');
+                        $('#calendar').fullCalendar('gotoDate',$(this).siblings('span').html(), Date.getMonthNumberFromName($(this).html() == 'Março' ? 'Mar' : $(this).html()),'01');
                         $('#calendar').fullCalendar( 'changeView', 'month');
                 });
@@ -72 +73 @@
                 $('.ui-datepicker-title .ui-datepicker-year').live('click',function(){
                         $tabs.tabs("select", "#calendar");
-                        var currentDate = $.fullCalendar.formatDate($('#calendar').fullCalendar('getDate'), "yyyy-MM-dd").split('-');
-                        $('#calendar').fullCalendar('gotoDate',$('.ui-datepicker-title .ui-datepicker-year').html(), Date.getMonthNumberFromName($('.ui-datepicker-title .ui-datepicker-month').html()), currentDate[2]);
+                        $('#calendar').fullCalendar('gotoDate',$(this).html(), '0', '01');
                         $('.fc-button-year').click();
                 });