Changeset 5626 for trunk/expressoMail1_2/js/draw_api.js

Timestamp:

03/05/12 16:55:14 (12 years ago)

Author:

cristiano

Message:

Ticket #2497 - Nova estrategia para o salvamento automatico de rascunhos

File:

• trunk/expressoMail1_2/js/draw_api.js (modified) (4 diffs)

trunk/expressoMail1_2/js/draw_api.js

@@ -4205 +4205 @@
                                 attach.fullFileName = file.name;
                                 attach.fileName = file.name;
-                                if(file.name.length > 10)
-                                        attach.fileName = file.name.substr(0, 18) + "..." + file.name.substr(file.name.length-9, file.name.length);
+                                if(file.name.length > 50)
+                                        attach.fileName = file.name.substr(0, 32) + " ... " + file.name.substr(file.name.length-9, file.name.length);
                                 attach.fileSize = formatBytes(file.size);
                                 if(maxAttachmentSise && file.size > maxAttachmentSise)
                                         attach.error = 'Tamanho de arquivo nao permitido!!'
-                                                                
-                                fileUploadMSG.find('.attachments-list').append(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));
-
-                                if(!maxAttachmentSise || file.size < maxAttachmentSise){
-                                        fileUploadMSG.find('.fileinput-button.new').append(data.fileInput[0]).removeClass('new');
-                                        fileUploadMSG.find('.attachments-list').find('[type=file]').addClass('hidden'); 
-                                }else
-                                        fileUploadMSG.find(' .fileinput-button.new').removeClass('new');
                                 
-                                fileUploadMSG.find(' .attachments-list').find('.button.close').button({
+                                var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));                           
+                                upload.find('.button.close').button({
                                         icons: {
                                                 primary: "ui-icon-close"
@@ -4230 +4223 @@
                                         $(this).parent().remove();
                                 });
+                                
+                                fileUploadMSG.find('.attachments-list').append(upload);
+
+                                if(!maxAttachmentSise || file.size < maxAttachmentSise){
+                                        fileUploadMSG.find('.fileinput-button.new').append(data.fileInput[0]).removeClass('new');
+                                        fileUploadMSG.find('.attachments-list').find('[type=file]').addClass('hidden'); 
+                                }else
+                                        fileUploadMSG.find(' .fileinput-button.new').removeClass('new');
 
                 })},
@@ -4274 +4275 @@
                                                         var attach = {};
                                                         attach.fileName = att.name
+                                                        if(attach.fileName.length > 45)
+                                                                attach.fileName = attach.fileName.substr(0, 32) + " ... " + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length);
+
                                                         attach.fileSize = formatBytes(onceOpenedMessages[folder_name][message_number].size);
                                                         var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));
                                                         upload.find('.status-upload').remove();
                                                         upload.find('.in-progress').remove(); 
-                                                        upload.find('p').append('<input type="hidden" name="fileId[]" value=\''+idATT+'\'/>');
-                                                        fileUploadMSG.find('.attachments-list').append(upload);
+                                                        upload.append('<input type="hidden" name="fileId[]" value=\''+idATT+'\'/>');
                                                         
+                                                        upload.find('.button.close').button({
+                                                            icons: {
+                                                                            primary: "ui-icon-close"
+                                                                    },
+                                                                    text: false
+                                                            }).click(function(){
+                                                                    var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
+                                                                    fileUploadMSG.find(' .attachments-list').find('input[value="'+idAttach+'"]');
+                                                                    delAttachment(ID,idAttach); 
+                                                                    $(this).parent().remove();
+                                                        });     
+                                                        
+                                                        fileUploadMSG.find('.attachments-list').append(upload);   
                                                 }
 
@@ -4287 +4303 @@
                                 
                                 jQuery('#message-attach-dialog').dialog('close');
-                                
-                                //botao fechar
-                                $('.attachments-list').find('.button.close').button({
-                                        icons: {
-                                                primary: "ui-icon-close"
-                                        },
-                                        text: false
-                                }).click(function(){
-                                        var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
-                                        fileUploadMSG.find(' .attachments-list').find('input[value="'+idAttach+'"]');
-                                        delAttachment(ID,idAttach); 
-                                        $(this).parent().remove();
-                                });     
                                 
                         });