Changeset 6760 for sandbox/2.4.2-expresso2/expressoMail1_2/js/draw_api.js

Timestamp:

07/11/12 17:39:49 (12 years ago)

Author:

gustavo

Message:

Ticket #2953 - Melhorar a disposição da listagem de anexos no expressoMail

File:

• sandbox/2.4.2-expresso2/expressoMail1_2/js/draw_api.js (modified) (3 diffs)

sandbox/2.4.2-expresso2/expressoMail1_2/js/draw_api.js

@@ -4384 +4384 @@
                                 attach.fileSize = formatBytes(file.size);
                                 if(maxAttachmentSize && file.size > maxAttachmentSize)
-                                        attach.error = 'Tamanho de arquivo nao permitido!!'
+                                        attach.error = 'Tamanho de arquivo nao permitido'
                                 else
-                                        attach.error = 'Loading...';    
+                                        attach.error = true;
                                 var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));                           
                                 upload.find('.att-box-delete').click(function(){
@@ -4423 +4423 @@
                                                         radius: 5
                                                 },
-                                                padding: 5, 
-                                                textAlign: 'center',
+                                                padding: 3, 
+                                                textAlign: 'left',
                                                 tip: true, // Give it a speech bubble tip with automatic corner detection
-                                                name: 'blue' // Style it according to the preset 'cream' style
+                                                name: (typeof(attach.error) == 'boolean' ? 'light' : 'red') // Style it according to the preset 'cream' style
                                         }
                 });
@@ -4440 +4440 @@
                 },
                 done: function(e, data){
+            var attach_box = fileUploadMSG.find('.att-box-loading:first').parents('.att-box');
+            var attach = {
+                fullFileName : attach_box.find(".att-box-fullfilename").text(),
+                fileSize : attach_box.find(".att-box-filesize").text(),
+                OK : true,
+                error : false
+            };
                         if(!!data.result && data.result != "[]" ){
                                 var newAttach = data.result;                             
-                                if(!newAttach.mailAttachment.error){
-                                        if(newAttach.rollback !== false)
-                                        {
-                                                fileUploadMSG.find('.att-box-loading:first').parents('div:first').append('<input type="hidden" name="fileId[]" value="'+newAttach['mailAttachment'][0][0].id+'"/>');
-                                                addAttachment(ID,newAttach['mailAttachment'][0][0].id);
-                                        }
-                                        else                             
-                                                fileUploadMSG.find('.att-box-loading:first').parents('div:first').find('.status-upload').append('Erro ao fazer upload!').addClass('message-attach-error');   
-                                }else{
-                                        fileUploadMSG.find('.att-box-loading:first').parents('div:first').find('.status-upload').append(newAttach.mailAttachment.error).addClass('message-attach-error');   
-                                }
-                                
+                                if(!newAttach.mailAttachment.error || newAttach.rollback !== false){
+                                        attach_box.append('<input type="hidden" name="fileId[]" value="'+newAttach['mailAttachment'][0][0].id+'"/>');
+                                        addAttachment(ID,newAttach['mailAttachment'][0][0].id);
+                }else {
+                                    attach_box.addClass('invalid-email-box');
+                    attach.error = newAttach.mailAttachment.error ? newAttach.mailAttachment.error : 'Erro ao anexar...';//.append(newAttach.mailAttachment.error).addClass('message-attach-error');   
+                }
                         }else {
-                                fileUploadMSG.find(' .progress.on-complete:first').parents('div:first').find('.status-upload').append('Erro ao fazer upload!').addClass('message-attach-error');
-                        }
+                                attach_box.addClass('invalid-email-box');//.qtip("api").updateContent("oi", true);
+                attach.error = 'Erro ao anexar...';
+                        }
+            attach_box.qtip("destroy").qtip({
+                content: DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist_tooltip.ejs", {attach : attach}),
+                position: {
+                    corner: {
+                        tooltip: 'bottomMiddle',
+                        target: 'topMiddle'
+                    },
+                    adjust: {
+                       resize: true,
+                       scroll: true
+                    }
+                },
+                show: {
+                    when: 'mouseover', // Don't specify a show event
+                    ready: false // Show the tooltip when ready
+                },
+                hide: 'mouseout', // Don't specify a hide event
+                style: {
+                    border: {
+                        width: 1,
+                        radius: 5
+                    },
+                    padding: 3, 
+                    textAlign: 'left',
+                    tip: true, // Give it a speech bubble tip with automatic corner detection
+                    name: (attach.error == false ? 'blue' : 'red')// Style it according to the preset 'cream' style
+                }
+            });
             fileUploadMSG.find(' .att-box-loading:first').remove();
                 }