Changeset 3137 for branches

Timestamp:

08/04/10 16:15:54 (14 years ago)

Author:

amuller

Message:

Ticket #1103 - Arrumando problema de \&nbsp\; no anexo ao encaminhar

Location:

branches/2.2/expressoMail1_2/js

Files:

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

branches/2.2/expressoMail1_2/js/draw_api.js

@@ -1799 +1799 @@
 //                      link_attachment.setAttribute("href", "javascript:download_attachments('"+info_msg.msg_folder+"','"+info_msg.msg_number+"',"+i+",'"+info_msg.attachments[i].pid+"','"+info_msg.attachments[i].encoding+"')");
                         link_attachment.innerHTML = url_decode(info_msg.attachments[i].name);
-                        link_attachment.innerHTML += " ("+borkb(info_msg.attachments[i].fsize)+")";
+                        link_attachment.innerHTML += " ("+borkb(info_msg.attachments[i].fsize)+")";
                         if((url_decode(info_msg.attachments[i].name).indexOf(".ics")!=-1) || (url_decode(info_msg.attachments[i].name).indexOf(".vcard")!=-1)){
                                 //Link para importar calendário

branches/2.2/expressoMail1_2/js/main.js

@@ -1158 +1158 @@
                                                 tmp = link_attachment.innerHTML.substring(0,link_attachment.innerHTML.lastIndexOf("("));
                                                 a_tmp[2] = "'"+tmp.substring(0,tmp.length-1)+"'";
-                                                s_tmp = escape(connector.serialize(a_tmp));
+                                                s_tmp = trim(escape(connector.serialize(a_tmp)));
 
                                                 divFiles.innerHTML += "<input style='border:0' type='CHECKBOX' name='forwarding_attachments[]' checked value=\""+s_tmp+"\"/>";
@@ -1264 +1264 @@
                                         tmp = link_attachment.innerHTML.substring(0,link_attachment.innerHTML.lastIndexOf("("));
                                         a_tmp[2] = "'"+tmp.substring(0,tmp.length-1)+"'";
-                                        s_tmp = escape(connector.serialize(a_tmp));
+                                        s_tmp = trim(escape(connector.serialize(a_tmp)));
                                         divFiles.innerHTML += "<input style='border:0' type='CHECKBOX' name='forwarding_attachments[]' checked value=\""+s_tmp+"\"/>";
                                         divFiles.appendChild(link_attachment);
@@ -1383 +1383 @@
                                 tmp = link_attachment.innerHTML.substring(0,link_attachment.innerHTML.lastIndexOf("("));
                                 a_tmp[2] = "'"+tmp.substring(0,tmp.length-1)+"'";
-                                s_tmp = escape(connector.serialize(a_tmp));
+                                s_tmp = trim(escape(connector.serialize(a_tmp)));
                                 divOriginalAttachments.innerHTML += "<input style='border:0' type='CHECKBOX' name='forwarding_attachments[]' checked value=\""+s_tmp+"\"/>";
                                 divOriginalAttachments.appendChild(link_attachment);
@@ -1779 +1779 @@
                         check_attachment.type = 'CHECKBOX';
                         check_attachment.name = 'forwarding_attachments[]';
-                        check_attachment.value = s_tmp;
+                        check_attachment.value = trim(s_tmp);
 
                         divFiles.insertBefore(document.createElement("BR"),divFiles.childNodes[0]);