Changeset 6875 for sandbox/2.4.2-expresso2

Timestamp:

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

Author:

gustavo

Message:

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

Location:

sandbox/2.4.2-expresso2

Files:

• expressoMail1_2/js/draw_api.js (modified) (4 diffs)
• expressoMail1_2/js/main.js (modified) (1 diff)
• expressoMail1_2/js/shortcut.js (modified) (4 diffs)
• library/ckeditor/plugins/expresso/plugin.js (modified) (2 diffs)
• prototype/modules/mail/js/foldertree.js (modified) (3 diffs)
• prototype/modules/mail/templates/float_folder_menu.ejs (modified) (1 diff)

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

@@ -1519 +1519 @@
                                         }
                                         
-                                        if($("#table_box").find("tr input:checked").length > 1 )
+                                        if(totalSelected() > 1 )
                                                 return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (totalSelected()+" mensagens selecionadas"), type: "messages"})+"</td></tr>");                             
                                         if(     $(this).find(".td_msg_subject").text().length > 18 )
@@ -1684 +1684 @@
                 
                 $(chk_box_element).click(function(e){
-                                updateSelectedMsgs($(this).is(':checked'),headers_msgs.msg_number);
-                                $(".selected_shortcut_msg").removeClass("current_selected_shortcut_msg selected_shortcut_msg");
-                                if(preferences.use_shortcuts == '1')
-                                        $(this).parents("tr:first").addClass("current_selected_shortcut_msg selected_shortcut_msg");
-                                changeBgColor(e,headers_msgs.msg_number);
+                        updateSelectedMsgs($(this).is(':checked'),headers_msgs.msg_number);
+                        $(".selected_shortcut_msg").removeClass("current_selected_shortcut_msg selected_shortcut_msg");
+                        $(".current_selected_shortcut_msg").removeClass("current_selected_shortcut_msg selected_shortcut_msg");
+                        if(preferences.use_shortcuts == '1')
+                                $(this).parents("tr:first").addClass("current_selected_shortcut_msg selected_shortcut_msg");
+                        changeBgColor(e,headers_msgs.msg_number);
+                        $(this).blur();
                 });
 
@@ -4027 +4029 @@
                 var pthis = $(this);
                 setTimeout(function() {
-                        var str = pthis.val().replace(/[,;\t\n]/gi, ",");
+                        if(pthis.val().split('"') > 1)
+                                var str = pthis.val().replace(/[,;\t]/gi, ","); 
+                        else
+                                var str = pthis.val().replace(/[,;\t\n\s]/gi, ",");
                         str = str.split(",");
                         $.each(str, function(index, value){
@@ -4678 +4683 @@
                 fullFileName : attach_box.find(".att-box-fullfilename").text(),
                 fileSize : attach_box.find(".att-box-filesize").text(),
-                OK : true,
                 error : false
             };

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

@@ -683 +683 @@
                                                         });
                                                         }
-                                                        if($("#table_box").find("tr input:checked").length > 1)
+                                                        if(totalSelected() > 1)
                                                                 return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (totalSelected()+" mensagens selecionadas"), type: "messages"})+"</td></tr>");
                                                         if(     $(this).find(".td_msg_subject").text().length > 18 )

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

@@ -331 +331 @@
         if($(".current_selected_shortcut_msg").prev().parents("#tbody_box").length)
             $(".current_selected_shortcut_msg").blur().removeClass("current_selected_shortcut_msg").prev().addClass("current_selected_shortcut_msg selected_shortcut_msg");
-        $(".current_selected_shortcut_msg").focus();
+        $(".current_selected_shortcut_msg").addClass("selected_shortcut_msg").focus();
     }
 },{'disable_in_input':true});
@@ -342 +342 @@
         if($(".current_selected_shortcut_msg").next().parents("#tbody_box").length)
             $(".current_selected_shortcut_msg").blur().removeClass("current_selected_shortcut_msg").next().addClass("current_selected_shortcut_msg selected_shortcut_msg");
-        $(".current_selected_shortcut_msg").focus();
+        $(".current_selected_shortcut_msg").addClass("selected_shortcut_msg").focus();
     }
 },{'disable_in_input':true});
@@ -364 +364 @@
             updateSelectedMsgs($(value).find(":checkbox").is(':checked'),$(value).attr("id"));
         });
+        $(".current_selected_shortcut_msg").focus();
     }
 },{'disable_in_input':true});
@@ -470 +471 @@
 },{'disable_in_input':true});
 
-shortcut.add("f5",function(){
+shortcut.add("f9",function(){
     Element("em_refresh_button").onclick();
     return;
-},{'disable_in_input':true});
+},{'disable_in_input':false});
 
 function exec_msg_action(action)

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){

sandbox/2.4.2-expresso2/prototype/modules/mail/js/foldertree.js

@@ -116 +116 @@
         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 +298 @@
                         }
                 }
-        }).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 +305 @@
                                 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;

sandbox/2.4.2-expresso2/prototype/modules/mail/templates/float_folder_menu.ejs

@@ -12 +12 @@
 
 <span class="float-menu">
-        <span class="ui-icon ui-icon-document float-menu-new floating-default" title="Nova Pasta"></span>  
-        <%if(!specialFolders[data.name_folder]){ %>
-                <span class="ui-icon ui-icon-pencil float-menu-edit floating-default" title="Editar Pasta"></span>  
-                <span class="ui-icon ui-icon-close float-menu-remove floating-default" title="Excluir Pasta"></span>  
-        <%} 
-        else if(data.name_folder == trashfolder){%>
-                <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_trash_imap();" title="Limpar Pasta"></span>  
-        <%}
-        else if(data.name_folder == spamfolder){%>
-                <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_spam_imap();" title="Limpar Pasta"></span>  
+        <%if(!data.flag.valid){ %>
+                <span class="ui-icon ui-icon-document float-menu-new floating-default" title="Nova Pasta"></span>  
+                <%if(!specialFolders[data.name_folder]){ %>
+                        <span class="ui-icon ui-icon-pencil float-menu-edit floating-default" title="Editar Pasta"></span>  
+                        <span class="ui-icon ui-icon-close float-menu-remove floating-default" title="Excluir Pasta"></span>  
+                <%} 
+                else if(data.name_folder == trashfolder){%>
+                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_trash_imap();" title="Limpar Pasta"></span>  
+                <%}
+                else if(data.name_folder == spamfolder){%>
+                        <span class="ui-icon ui-icon-trash float-menu-clean floating-default" onclick="empty_spam_imap();" title="Limpar Pasta"></span>  
+                <%}%>
+        <%}else{ %>
+        <%      if(parseInt(data.acl.create)){%>
+                        <span class="ui-icon ui-icon-document float-menu-new floating-default" title="Nova Pasta"></span> 
+        <%              if(parseInt(data.acl.delete) && parseInt(data.acl.rename) && !specialFolders[data.name_folder] && !data.flag.head){ %>
+                                <span class="ui-icon ui-icon-pencil float-menu-edit floating-default" title="Editar Pasta"></span>  
+        <%              } %>
+
+        <%      } %>
+        <%      if(parseInt(data.acl.delete) && !specialFolders[data.name_folder] && !data.flag.head){ %>
+                        <span class="ui-icon ui-icon-close float-menu-remove floating-default" title="Excluir Pasta"></span>
+                <%}%>
         <%}%>
-        
  </span>