Changeset 5658

Timestamp:

03/07/12 11:28:50 (11 years ago)

Author:

douglasz

Message:

Ticket #2486 - Correções de sintaxe e de interface dos sinalizadores

Location:

trunk

Files:

• expressoMail1_2/js/doiMenuData.js (modified) (3 diffs)
• expressoMail1_2/js/draw_api.js (modified) (1 diff)
• prototype/modules/mail/js/followupflag.js (modified) (2 diffs)
• prototype/modules/mail/templates/followupflag_configure.ejs (modified) (2 diffs)

trunk/expressoMail1_2/js/doiMenuData.js

@@ -6 +6 @@
                                 var lableleds = new Array();
                                 var msg_folder = current_folder;
-                                var messages = [];
+                                var messages = new Array();
                                 if(currentTab == 0){
                                         var id = get_selected_messages().split(',');
                                         for (i = 0; i < id.length; i++){
                                                 messages.push({
-                                                        "msg_number": id[i],
-                                                        "msg_folder": msg_folder,
+                                                        msg_number: id[i],
+                                                        msg_folder: msg_folder
                                                 });
                                         }
@@ -34 +34 @@
                                                 messages.push({
                                                         "msg_number": id.replace(/_[a-zA-Z0-9]+/,""),
-                                                        "msg_folder": msg_folder,
+                                                        "msg_folder": msg_folder
                                                 });
                                         }
@@ -90 +90 @@
         for(var i=0; i<labels.length; i++) {
                 menuLabelItems["label"+labels[i].id] = {
-                        "name" : labels[i].name,
+                        "name" : labels[i].name
                 }
         }

trunk/expressoMail1_2/js/draw_api.js

@@ -2919 +2919 @@
                                         calendars: Calendar.calendars,
                                         category: '',
-                                        class: '1',
+                                        'class': '1',
                                         delegatedFrom: {},
                                         endDate: startEvent.toString(User.preferences.dateFormat),

trunk/prototype/modules/mail/js/followupflag.js

@@ -423 +423 @@
                         for(var i=0; i<alarmInRange.length; i++){
                                 var date = Date.parseExact(alarmInRange[i].alarmDeadline, 'yyyy-MM-dd hh:mm:ss');
-                                alarmInRange[i].alarmDeadline = date.toString('hh:mm');
+                                if(date)
+                                        alarmInRange[i].alarmDeadline = date.toString('hh:mm');
                         }
                         var caption = (alarmInRange.length == 1) ?
@@ -448 +449 @@
                                 'vcenter_short_message': false,
                                 'position': ['right - 20', 'bottom - ' + offsetHeight.toString() ],
-                                'custom_class': 'right-bottom followupflag-alarm',
+                                'custom_class': 'right-bottom followupflag-alarm'
                         }).dialog;
 

trunk/prototype/modules/mail/templates/followupflag_configure.ejs

@@ -55 +55 @@
                         <div class="alarm-fields">
                                 <input type="checkbox" name="alarm" <%=(followupflagged.alarmDeadline) ? 'checked="checked"' : '' %> /><label><%= get_lang("Alarm")%>: </label>
-                                <input type="text" name="alarmDate" class="date" size="9" value="<%=(followupflagged.alarmDeadline) ? followupflagged.alarmDeadline.toString('dd/MM/yyyy') : '' %>" /> ás 
+                                <input type="text" name="alarmDate" class="date" size="10" value="<%=(followupflagged.alarmDeadline) ? followupflagged.alarmDeadline.toString('dd/MM/yyyy') : '' %>" /> ás 
                                 <input type="text" name="alarmTime" class="time" size="8" value="<%=(followupflagged.alarmDeadline) ? followupflagged.alarmDeadline.toString('hh:mm') : '' %>" />
                         </div>          
@@ -64 +64 @@
                 <div class="right-data input-done">
                         <label><%= get_lang("Conclusion")%>:</label>
-                        <input <%=(followupflagged.isDone && followupflagged.isDone != '0') ? 'disabled="disabled"' : '' %> type="text" name="doneDate" class="date" size="8" value="<%=(followupflagged.doneDeadline) ? followupflagged.doneDeadline.toString('dd/MM/yyyy') : '' %>" /> ás 
+                        <input <%=(followupflagged.isDone && followupflagged.isDone != '0') ? 'disabled="disabled"' : '' %> type="text" name="doneDate" class="date" size="10" value="<%=(followupflagged.doneDeadline) ? followupflagged.doneDeadline.toString('dd/MM/yyyy') : '' %>" /> ás 
                         <input <%=(followupflagged.isDone && followupflagged.isDone != '0') ? 'disabled="disabled"' : '' %> type="text" name="doneTime" class="time" size="8" value="<%=(followupflagged.doneDeadline) ? followupflagged.doneDeadline.toString('hh:mm') : '' %>" />
                 </div>