Ignore:
Timestamp:
10/01/12 18:43:19 (8 years ago)
Author:
alexandrecorreia
Message:

Ticket #3093 - Merge de versões ( Expresso Trunk para Expresso Sandbox ).

Location:
sandbox/2.4.3-expresso-rest
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sandbox/2.4.3-expresso-rest

    • Property svn:mergeinfo changed
      /trunkmerged: 7332
  • sandbox/2.4.3-expresso-rest/expressoMail1_2/js/main.js

    r7330 r7333  
    25052505                att.type = 'imapPart'; 
    25062506                var idATT = JSON.stringify(att); 
    2507                 addAttachment( new_border_ID , idATT);   
    2508  
     2507                addAttachment( new_border_ID , idATT); 
     2508                 
    25092509                var attach = {}; 
    2510  
    2511                 attach.fileName =  attachments[i].text.substring(0, attachments[i].text.lastIndexOf('(')); 
     2510                var attachText = (is_ie ? attachments[i].innerText : attachments[i].text); 
     2511                attach.fileName =  attachText.substring(0, attachText.lastIndexOf('(')); 
    25122512                attach.fullFileName = attach.fileName; 
    2513  
    25142513                if(attach.fileName.length > 20) 
    25152514                    attach.fileName = attach.fileName.substr(0, 17) + " ... " + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length); 
    2516  
    2517                 attach.fileSize =  attachments[i].text.substring(( attachments[i].text.lastIndexOf('(')+1), attachments[i].text.lastIndexOf(')')); 
     2515                attach.fileSize =  attachText.substring((attachText.lastIndexOf('(')+1),attachText.lastIndexOf(')')); 
    25182516                attach.error = false; 
    25192517 
Note: See TracChangeset for help on using the changeset viewer.