Changeset 5729 for trunk/prototype/modules/calendar/js/calendar.codecs.js

Timestamp:

03/15/12 11:50:53 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Suporte a alarme de eventos javascript no modulo expressoMAil1_2

File:

• trunk/prototype/modules/calendar/js/calendar.codecs.js (modified) (2 diffs)

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

@@ -198 +198 @@
                         this.addAlarm( eventsDay[i] );
                 }
-        },
-        
-        addAlarm: function( eventDay ){
+        },
+        
+        addAlarm: function( eventDay ){            
                 if(!DataLayer.tasks[parseInt(eventDay.sendTime)]){
                     DataLayer.task( parseInt(eventDay.sendTime) , function( timestamp ){
-                        DataLayer.render('templates/alarm.ejs',{event: eventDay}, function( html ){
-                                var dlgAlarm = jQuery('#div-alarm').html( html ).find('.alarm-event.active');
-                                dlgAlarm.dialog({resizable: false, modal:true, width:400, minHeight: 100,position: 'center', close:function(){$(this).dialog('destroy');$(this).dialog('open');}});
+                        var path = User.moduleName == 'expressoCalendar' ? '' : '../prototype/modules/calendar/';
+                        DataLayer.render(path+'templates/alarm.ejs',{event: eventDay}, function( html ){                                
+                                $.Zebra_Dialog(html , {
+                                    'type':     'question',
+                                    'overlay_opacity': '0.5',
+                                    'buttons':  ['Fechar'],
+                                    'onClose':  function(clicked) {}
+                               });
                         });
                     });
@@ -611 +616 @@
                                                         receiveNotification : attend.receiveNotification,
                                                         alarms : $.map(attend.alarms || [], function( alarm ){
-                                                                return DataLayer.get('alarm', alarm);
+                                                                var alarm = DataLayer.get('alarm', alarm);
+                                                                return (alarm == "" ? (null) : alarm);
                                                         })
                                                 };