Changeset 6875 for sandbox/2.4.2-expresso2/library

Timestamp:

07/25/12 16:02:01 (12 years ago)

Author:

gustavo

Message:

Ticket #2954 - Corrigidos alguns bugs de anexos e selecao de mensagens

File:

• sandbox/2.4.2-expresso2/library/ckeditor/plugins/expresso/plugin.js (modified) (2 diffs)

sandbox/2.4.2-expresso2/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();
@@ -166 +166 @@
                         fileUploadMSG.find(' .attachments-list').hide();
                     }
+                    if(jqXHR){
+                        jqXHR[iterator].abort();
+                    }
                                 });
                                 
-            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
-                    }
-                },
-                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: (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');
-                                                                
+                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
+                        }
+                    },
+                    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: (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){