Changeset 5619

Timestamp:

03/04/12 12:39:47 (11 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Remocao do importe de arquivos da agenda na inicializacao do modulo expressoMail

Location:

trunk/expressoMail1_2/js

Files:

• draw_api.js (modified) (1 diff)
• main.js (modified) (3 diffs)

trunk/expressoMail1_2/js/draw_api.js

@@ -2878 +2878 @@
                 new_event_logo.style.marginLeft = "5px";
                 new_event_logo.onclick = function(){
+                import_implements_calendar();
+                
+                
                         DataLayer.dispatchPath = "../prototype/";
                         var path = "../prototype/modules/calendar/";

trunk/expressoMail1_2/js/main.js

@@ -3237 +3237 @@
 }
 
+function import_implements_calendar(){
+
+        if(typeof(Calendar) == "undefined"){
+                $.ajax({ url: "../expressoCalendar/index.php", async: false});
+                $.ajax({ url: "../prototype/modules/calendar/js/calendar.date.js", async: false});
+                $.ajax({ url: "../prototype/modules/calendar/js/helpers.js", async: false});
+                $.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});
+                $.ajax({ url: "../prototype/plugins/dateFormat/dateFormat.js", async: false});
+
+                
+                DataLayer.dispatchPath = "../prototype/";       
+        }
+}
+
+
 function select_import_folder(){
         //Begin: Verify if the file extension is allowed.
@@ -3289 +3306 @@
     }   
         if(new_agenda == "True" && $("#expressoCalendarid")[0]){
+                import_implements_calendar();
                 $( "#import-dialog" ).dialog({
                         autoOpen: false,
@@ -3311 +3329 @@
                                                 case 1:
                                                         $("#select-agenda").html('');
-                                                                for(var calendario in Calendar.calendarIds){
+                                                                for(var id in Calendar.calendars){
                                                                                 var doc = document .createElement("OPTION");
-                                                                                doc.value = Calendar.signatures[parseInt(calendario)].calendar.id;
-                                                                                doc.innerHTML = Calendar.signatures[parseInt(calendario)].calendar.name;
+                                                                                doc.value = Calendar.calendars[id].id;
+                                                                                doc.innerHTML = Calendar.calendars[id].name;
                                                                                 $("#select-agenda").append(doc);