Changeset 6045

Timestamp:

04/26/12 15:20:17 (12 years ago)

Author:

gustavo

Message:

Ticket #2611 - recomitado problema de upload resolvido na r5856

File:

• trunk/expressoMail1_2/js/draw_api.js (modified) (1 diff)

trunk/expressoMail1_2/js/draw_api.js

@@ -3663 +3663 @@
                 sequentialUploads: true,
                 add: function (e, data) {
+                        
                         if(!maxAttachmentSise || data.files[0].size < maxAttachmentSise) {
                                 setTimeout(function() {
                                         $('#attDisposition'+ID).val('attachment');
+                                        delete data.fileInput; 
                                         data.submit();
                                 }, 5000);
-                        }
+                        }               
+                        var attach = {};
+                        attach.fullFileName = data.files[0].name;
+                        attach.fileName = data.files[0].name;
+                        if(data.files[0].name.length > 50)
+                                attach.fileName = data.files[0].name.substr(0, 32) + " ... " + data.files[0].name.substr(data.files[0].name.length-9, data.files[0].name.length);
+                        attach.fileSize = formatBytes(data.files[0].size);
+                        if(maxAttachmentSise && data.files[0].size > maxAttachmentSise)
+                                attach.error = 'Tamanho de arquivo nao permitido!!'
+
+                        var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));                           
+                        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+'"]').remove();
+                                delAttachment(ID, idAttach)
+                                $(this).parent().remove();
+                        });
+
+                        fileUploadMSG.find('.attachments-list').append(upload);
+
+                        if(!maxAttachmentSise || data.files[0].size < maxAttachmentSise)
+                            fileUploadMSG.find('.attachments-list').find('[type=file]').addClass('hidden');     
+                        else
+                            fileUploadMSG.find(' .fileinput-button.new').removeClass('new');
                 },
-                change: function (e, data) {
-                        $.each(data.files, function (index, file) {
-                                var attach = {};
-                                attach.fullFileName = file.name;
-                                attach.fileName = file.name;
-                                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!!'
-                                
-                                var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));                           
-                                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+'"]').remove();
-                                        delAttachment(ID, idAttach)
-                                        $(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');
-
-                })},
-
                 done: function(e, data){
                         if(!!data.result && data.result != "[]" ){
-                                var newAttach = jQuery.parseJSON(data.result);
-                                
-                                //Compatibilidade com Firefox3.6
-                                    if(newAttach === null ) newAttach = jQuery.parseJSON(data.result.text());
-                                
+                                var newAttach = jQuery.parseJSON(data.result);                               
                                 if(newAttach.rollback !== false)
                                 {