Index: sandbox/2.4.2-expresso2/library/ckeditor/plugins/expresso/plugin.js =================================================================== --- sandbox/2.4.2-expresso2/library/ckeditor/plugins/expresso/plugin.js (revision 6776) +++ sandbox/2.4.2-expresso2/library/ckeditor/plugins/expresso/plugin.js (revision 6875) @@ -125,10 +125,10 @@ }, 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,49 +166,52 @@ 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(''); - + idattachbycontent++; }); CKEDITOR.dialog.getCurrent().hide(); - + }, done: function(e, data){ Index: sandbox/2.4.2-expresso2/prototype/modules/mail/js/foldertree.js =================================================================== --- sandbox/2.4.2-expresso2/prototype/modules/mail/js/foldertree.js (revision 6574) +++ sandbox/2.4.2-expresso2/prototype/modules/mail/js/foldertree.js (revision 6875) @@ -116,4 +116,10 @@ cp_tree1 = tree1; cp_tree2 = tree2; + var shared_acls = {}; + + $.each(cp_tree2, function(index, value){ + shared_acls[value.id] = value.acl_share; + }); + $("#content_folders").removeClass("menu-degrade").parent().removeClass("image-menu"); var html = DataLayer.render('../prototype/modules/mail/templates/detailedfoldertree.ejs', {folders: [tree1, tree2, tree3]}); @@ -292,5 +298,6 @@ } } - }).hover( + }); + $(".folder").not(".head_folder").not(".shared-folders").parent().find(".folder").hover( function(){ //CASO A LI NÃO TENHA UM eventNU FLUTUANTE AINDA, O eventNU É ADICIONADO! @@ -298,10 +305,22 @@ var folder_ = $(this); var folder_name; + var shared = { + head : false, + valid : false + }; if(folder_.parent().attr('id')){ folder_name = folder_.parent().attr('id').split(cyrus_delimiter); folder_name = folder_name[folder_name.length -1]; + shared.valid = folder_.parent().attr('id').search("user/") == 0 ? true : false; }else folder_name = "Root"; - html = DataLayer.render("../prototype/modules/mail/templates/float_folder_menu.ejs", {name_folder : folder_name}); + + if(shared.valid){ + shared.head = folder_.parent().attr('id').split(cyrus_delimiter).length == 2 ? true : false; + var teste = folder_.parent().attr('id').split(cyrus_delimiter); + var acls = shared_acls[teste[0]+cyrus_delimiter+teste[1]]; + } + + html = DataLayer.render("../prototype/modules/mail/templates/float_folder_menu.ejs", {name_folder : folder_name, flag : shared, acl : acls}); //FUNÇÃO DO eventNU FLUTUANTE EDITAR < BEGIN var esc = false; Index: sandbox/2.4.2-expresso2/prototype/modules/mail/templates/float_folder_menu.ejs =================================================================== --- sandbox/2.4.2-expresso2/prototype/modules/mail/templates/float_folder_menu.ejs (revision 5948) +++ sandbox/2.4.2-expresso2/prototype/modules/mail/templates/float_folder_menu.ejs (revision 6875) @@ -12,15 +12,27 @@
Index: sandbox/2.4.2-expresso2/expressoMail1_2/js/main.js =================================================================== --- sandbox/2.4.2-expresso2/expressoMail1_2/js/main.js (revision 6850) +++ sandbox/2.4.2-expresso2/expressoMail1_2/js/main.js (revision 6875) @@ -683,5 +683,5 @@ }); } - if($("#table_box").find("tr input:checked").length > 1) + if(totalSelected() > 1) return $("