Changeset 6930 for trunk/library/ckeditor/plugins/expresso/plugin.js

Timestamp:

08/03/12 15:32:43 (12 years ago)

Author:

gustavo

Message:

Ticket #2954 - Merge de algumas novas funcionalidades da nova versão, #2953, #2971

File:

• trunk/library/ckeditor/plugins/expresso/plugin.js (modified) (2 diffs)

trunk/library/ckeditor/plugins/expresso/plugin.js

@@ -125 +125 @@
                 },
                 add: function (e, data) {
-     
+            var iterator = idattachbycontent;
                         if(!maxAttachmentSize || data.files[0].size < maxAttachmentSize || is_ie) {
                                 setTimeout(function() {
                                         $('#attDisposition'+ID).val('embedded');
-                                        data.submit();
-                                }, 5000);
+                                        jqXHR[iterator] = data.submit();
+                                }, 100);
                         }
-
+            fileUploadMSG.find(' .attachments-list').show();
                         $.each(data.files, function (index, file) {     
                                 var attach = {};
                                 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 > 20)
+                                        attach.fileName = file.name.substr(0, 17) + "..." + file.name.substr(file.name.length-9, file.name.length);
                                 attach.fileSize = formatBytes(file.size);
                                 if(maxAttachmentSize && file.size > maxAttachmentSize)
                                         attach.error = 'Tamanho de arquivo nao permitido!!'
-                                                                
+                                else
+                    attach.error = true;
                                 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(){
+                                upload.find('.att-box-delete').click(function(){
                                         var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
                         
@@ -165 +161 @@
                     $('.attachments-list').find('input[value="'+idAttach+'"]').remove();
                     delAttachment(ID, idAttach);
-                                        $(this).parent().remove();
+                                        $(this).parent().qtip("destroy");
+                    $(this).parent().remove();
+                    if(!fileUploadMSG.find(' .attachments-list').find(".att-box").length){
+                        fileUploadMSG.find(' .attachments-list').hide();
+                    }
+                    if(jqXHR){
+                        jqXHR[iterator].abort();
+                    }
                                 });
                                 
-            fileUploadMSG.find('.attachments-list').append(upload);
-
-                        if(!maxAttachmentSize || file.size < maxAttachmentSize){
-                                if(data.fileInput){
-                                        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').append(upload);
+                fileUploadMSG.find('.attachments-list .att-box:last').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,
+                           screen: show
+                        }
+                    },
+                    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
+                        },
+                        width: {
+                             min: 75,
+                             max : 1000
+                        },
+                        padding: 3, 
+                        textAlign: 'left',
+                        tip: true, // Give it a speech bubble tip with automatic corner detection
+                        name: (typeof(attach.error) == 'boolean' ? 'light' : 'red') // Style it according to the preset 'cream' style
+                    }
+                });
+                        if(!maxAttachmentSize || file.size < maxAttachmentSize){
+                                if(data.fileInput){
+                                        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');
+                        }                                       
                 CKEDITOR.instances['body_'+ID].insertHtml('<img src=""/>');
-
+                idattachbycontent++; 
                         });
                 
             CKEDITOR.dialog.getCurrent().hide();        
-                        
+                       
                 },
                 done: function(e, data){
-                        if(!!data.result && data.result != "[]"){
-                                var newAttach = data.result;
-                                if(!newAttach.mailAttachment.error){
-                                        if(newAttach.rollback !== false)
-                                        {
-                                                fileUploadMSG.find('.in-progress:first').parents('p').append('<input type="hidden" name="fileId[]" value="'+newAttach['mailAttachment'][0][0].id+'"/>').find('.status-upload').addClass('ui-icon ui-icon-check');
-                                                addAttachment(ID,newAttach['mailAttachment'][0][0].id);
-                                                var content_body  = RichTextEditor.getData('body_'+ID);
-                                                var rex = new RegExp('<img src="" [^\/>]*\/>', 'i'); 
-                                                var newImg = '<img src="../prototype/getArchive.php?mailAttachment='+newAttach['mailAttachment'][0][0].id+'" />'; 
-                                                content_body = content_body.replace(rex,newImg); 
-                                                RichTextEditor.setData('body_'+ID,content_body); 
-                                        }
-                                        else
-                                                fileUploadMSG.find('.in-progress:first').parents('p').find('.status-upload').append('Erro ao fazer upload!').addClass('message-attach-error');   
+            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 || newAttach.rollback !== false){
+                                        attach_box.append('<input type="hidden" name="fileId[]" value="'+newAttach['mailAttachment'][0][0].id+'"/>');
+                                        addAttachment(ID,newAttach['mailAttachment'][0][0].id);
+                                        var content_body  = RichTextEditor.getData('body_'+ID);
+                                        var rex = new RegExp('<img src="" [^\/>]*\/>', 'i'); 
+                                        var newImg = '<img src="../prototype/getArchive.php?mailAttachment='+newAttach['mailAttachment'][0][0].id+'" />'; 
+                                        content_body = content_body.replace(rex,newImg); 
+                                        RichTextEditor.setData('body_'+ID,content_body); 
                                 }else{
-                                        fileUploadMSG.find('.in-progress:first').parents('p').find('.status-upload').append(newAttach.mailAttachment.error).addClass('message-attach-error');   
-                                }
-                        }else 
-                        {
-                fileUploadMSG.find('.in-progress:first').parents('p').find('.status-upload').append('Erro ao fazer upload!').addClass('message-attach-error');   
-                        }
-                        fileUploadMSG.find('.in-progress:first').remove();
-                    
+                                        attach_box.addClass('invalid-email-box');
+                    attach.error = newAttach.mailAttachment.error ? newAttach.mailAttachment.error : 'Erro ao anexar...';
+                }
+                        }else {
+                attach_box.addClass('invalid-email-box');
+                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,
+                       screen: show
+                    }
+                },
+                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
+                    },
+                    width: {
+                         min: 75,
+                         max : 1000
+                    },
+                    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();
                 }
         });