Changeset 2497

Timestamp:

04/13/10 12:11:38 (14 years ago)

Author:

amuller

Message:

Ticket #1035 - Implementando a funcao borkb

Location:

trunk/expressoMail1_2/js

Files:

• common_functions.js (modified) (1 diff)
• draw_api.js (modified) (2 diffs)
• main.js (modified) (1 diff)

trunk/expressoMail1_2/js/common_functions.js

@@ -662 +662 @@
                 return rb;
         }
+}
+
+function borkb(size){
+        kbyte = 1024;
+        mbyte = kbyte*1024;
+        gbyte = mbyte*1024;
+        if (!size)
+                size = 0;
+        if (size < kbyte)
+                return size + 'B';
+        else if (size < mbyte)
+                return parseInt(size/kbyte) + 'KB';
+        else if (size < gbyte)
+                if (size/mbyte > 100)
+                        return (size/mbyte).toFixed(0) + 'MB';
+                else
+                        return (size/mbyte).toFixed(1) + 'MB';
+        else
+                return parseInt(size/gbyte).toFixed(1) + 'GB';
 }
 

trunk/expressoMail1_2/js/draw_api.js

@@ -1037 +1037 @@
                 td_element6.setAttribute("noWrap","true");
                 td_element6.setAttribute("align", "center");
-                
-                msg_size = headers_msgs.Size;
-                if (msg_size < 1048576 && msg_size > 1024)
-                        td_element6.innerHTML = this.round(msg_size / 1024, 0) + ' Kb';
-                else if(msg_size > 1024)
-                        td_element6.innerHTML = this.round(msg_size / (1024*1024), 1) + ' Mb';
-                else
-                        td_element6.innerHTML = "1 Kb";
+
+                td_element6.innerHTML = borkb(headers_msgs.Size);
 
                 tr_element.appendChild(td_element1);
@@ -1813 +1807 @@
 //                      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);
-                        msg_size = info_msg.attachments[i].fsize;
-                        if (msg_size < 1048576 && msg_size > 1024)
-                                link_attachment.innerHTML += ' (' + this.round(msg_size / 1024, 0) + ' Kb)';
-                        else if(msg_size > 1024)
-                                link_attachment.innerHTML += ' (' + this.round(msg_size / (1024*1024), 1) + ' Mb)';
-                        else
-                                link_attachment.innerHTML += ' (' + msg_size + ' bytes)';
+                        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

trunk/expressoMail1_2/js/main.js

@@ -1822 +1822 @@
                         var fileName = attach_files[att_index].substr(0,attach_files[att_index].indexOf('_SIZE_'));
                         var fileSize = parseInt(attach_files[att_index].substr(attach_files[att_index].indexOf('_SIZE_')+6))/1024
-                        link_attachment.innerHTML = fileName + " ("+parseInt(fileSize)+" kb)";
+                        link_attachment.innerHTML = fileName + " ("+borkb((parseInt(fileSize)*1024))+")";
 
                         var href = "'"+folder_id+"','"+data.msg_no+"','"+(att_index)+"','"+(att_index+2)+"','base64'";