Changeset 5835 for trunk/expressoMail1_2/js/main.js

Timestamp:

03/27/12 16:43:45 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correcoes e melhorias no expressoCalendar

File:

• trunk/expressoMail1_2/js/main.js (modified) (3 diffs)

trunk/expressoMail1_2/js/main.js

@@ -3285 +3285 @@
                 //$.ajax({ url: "../expressoCalendar/index.php", async: false});
                 //$.ajax({url: "../prototype/modules/calendar/js/calendar.date.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
-                $.ajax({url: "../prototype/modules/calendar/js/map.disponibility.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
-                $.ajax({url: "../prototype/modules/calendar/js/helpers.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
+                $.ajax({url: "../prototype/modules/calendar/js/map.disponibility.js", async: false, beforeSend: function( xhr ) {xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
+                $.ajax({url: "../prototype/modules/calendar/js/helpers.js", async: false, beforeSend: function( xhr ) {xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
                 //$.ajax({ url: "../prototype/modules/calendar/js/timezone.js", async: false});
                 //$.ajax({ url: "../prototype/modules/calendar/js/calendar.codecs.js", async: false});
-                $.ajax({url: "../prototype/plugins/encoder/encoder.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
+                $.ajax({url: "../prototype/plugins/encoder/encoder.js", async: false, beforeSend: function( xhr ) {xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
                 //$.ajax({url: "../prototype/plugins/dateFormat/dateFormat.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
 
-                $.ajax({ url: "../prototype/plugins/fullcalendar/fullcalendar.js", async: false , beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
+                $.ajax({url: "../prototype/plugins/fullcalendar/fullcalendar.js", async: false , beforeSend: function( xhr ) {xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
                 
                 
@@ -3417 +3417 @@
                                                         });
                                                         return;
-                                                        break;
-                                                case 4:
-                                                        alert('Seu evento já se encontra atualizado');
-                                                        return;
-                                                        break;
-                                                case 5:
-                                                        $.ajax({
-                                                                url: "controller.php?action="+import_url+'&from_ajax=true&selected=true',
-                                                                success: function(msg){
-                                                                alert( ( ( connector.unserialize(msg)) == "ok") ? "Atualizado com sucesso " : "Ocorreu um erro ao atualizar o evento" );
-                                                                }
-                                                        });
-                                                        return;
-                                                        break;
+                                                        break;                                          
                                                 case 6:
                                                         var acceptedSuggestion = confirm("Deseja atualizar o evento de acordo com a sugestão ?");
@@ -3456 +3443 @@
                                                                                 
                                                                                 $.ajax({
-                                                                                         url: "controller.php?action="+import_url+'&from_ajax=true&selected='+$("#select-agenda option:selected").val()+'&status='+$("#select-status option:selected").val(),
+                                                                                         url: "controller.php?action="+import_url+'&from_ajax=true&selected='+ (parseInt(typeImport) == 5 || parseInt(typeImport) == 4 ? 'true' : $("#select-agenda option:selected").val()) +'&status='+$("#select-status option:selected").val(),
                                                                                          success: function(msg){
                                                                                                         alert( ( (msg = connector.unserialize(msg)) == "ok") ? "Atualizado com sucesso para " : "Ocorreu um erro ao atualizar o evento" );