Changeset 7167 for sandbox/newExpressoMail/expressoMail1_2/js/main.js

Timestamp:

09/04/12 18:07:11 (12 years ago)

Author:

gustavo

Message:

Ticket #2939 - Melhorias na exibicao das abas e da listagem de email

File:

• sandbox/newExpressoMail/expressoMail1_2/js/main.js (modified) (23 diffs)

sandbox/newExpressoMail/expressoMail1_2/js/main.js

@@ -86 +86 @@
                 current_folder="INBOX";
 
-                $( "#ptabs span.ui-icon-close" ).live( "click", function() { 
+                $( "#ptabs ul span.ui-icon.tab-close" ).live( "click", function() { 
                         removeTab($( this ).prev().attr("href"));
-
+/*
                         var teste = "";
                         var ola = $( this );
@@ -97 +97 @@
                         });
                         $.cookie('open_tabs', teste.substring(0, teste.length-1));
+*/
                 });
 
@@ -103 +104 @@
                         helper : function(e, drag){
                                 var helper = $(drag).clone();
-                                helper.addClass("ui-corner-all").css("width", "auto").find("span.ui-icon-close").hide().end().find("a").html("Mover "+helper.find("a").html());
+                                helper.addClass("ui-corner-all").css("width", "auto").find("span.ui-icon").hide().end().find("a").html("Mover "+helper.find("a").html());
                                 return helper;
                         },
-                        placeholder: 'ui-state-highlight',
+                        placeholder: 'ui-state-highlight-prognus',
                         forcePlaceholderSize: true
                 }).disableSelection();
-
+/*
                 if($.cookie('open_tabs')){      
                         $.Zebra_Dialog("Gostaria de recuperar suas mensagens que estavam abertas?", {
@@ -156 +157 @@
                         });
                 }
-
+*/
                 if( (window.google && google.gears) && !google.gears.factory.getPermission())
                     preferences.use_local_messages=0;
@@ -205 +206 @@
                 DataLayer.get("folder", true);
                 cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);     
-                
-                if($.cookie('collapse_folders') == "true"){
-                        if(!is_ie)
-                                $("#folderscol").addClass( "hidden");
-                        else
-                                $("#folderscol").hide();
-                        $(".collapse_folders").addClass("ui-icon ui-icon-triangle-1-e").children().attr('title', "Expandir");
-                        refresh();
-                        //resizeWindow();
-                }       
-                else{
-                        $(".collapse_folders").addClass("ui-icon ui-icon-triangle-1-w").children().attr('title', "Ocultar");
-                        refresh();
-                        //resizeWindow();
-                }
-                
+
                 $(".collapse_folders_td").attr('title', "Ocultar/Expandir").click(function(){
-                        if($("#folderscol").css("display") != "none"){
-                                if(!is_ie)
-                                        $("#folderscol").addClass( "hidden");
-                                else
-                                        $("#folderscol").hide();
-                                        
-                                $(".collapse_folders").removeClass("ui-icon-triangle-1-w");
-                                $(".collapse_folders").addClass("ui-icon-triangle-1-e");
-                                $(".collapse_folders").parent().attr('title', "Expandir");
-                                $.cookie('collapse_folders', "true");
+                        $(this).find("span").toggle();
+                        $("#folderscol").toggle("blind", {direction: "horizontal"}, "normal", function(){
                                 refresh();
-                                resizeWindow();
-                        }else{
-                                if(!is_ie)
-                                        $("#folderscol").removeClass( "hidden");
-                                else
-                                        $("#folderscol").show();
-                                $(".collapse_folders").removeClass("ui-icon-triangle-1-e");
-                                $(".collapse_folders").addClass("ui-icon-triangle-1-w");
-                                $(".collapse_folders").parent().attr('title', "Ocultar");
-                                $.cookie('collapse_folders', "false");
-                                refresh();
-                                //resizeWindow();
-                        }
-                        //resizeWindow();
-                        
+                                resizeWindow(); 
+                        });
                 }).hover(
                         function(){
@@ -569 +534 @@
                 else {
                         var sbj = msg_info.subject.length < 21 ? msg_info.subject : msg_info.subject.substr(0,21) + "...";
+                        //console.log(msg_info);
                         var content = $(DataLayer.render("../prototype/modules/mail/templates/email.ejs", {info : msg_info, ID : id_msg_read}));
 
-                        createTab(sbj, content.html(), id_msg_read, function(content){
-                content.find(".message-flags").find(".message-important-flag").button({
-                        icons: {
-                                primary: "ui-icon-notice"
-                        },
-                    text: false
-                }).end().find(".message-unread-flag").button({
-                        icons: {
-                                primary: "ui-icon-mail-closed"
-                        },
-                    text: false
-                }).end().find(".message-spam-flag").button({
-                        icons: {
-                                primary: "ui-icon-alert"
-                        },
-                    text: false 
-                }).end().find(".message-followup-flag").button({
-                        icons: {
-                                primary: "ui-icon-flag"
-                        },
-                    text: false
-                });
-                content.find(".message-flags").buttonset();
-
-                content.find(".messages-controll").find(".message-prev").button({
-                        icons: {
-                                primary: "ui-icon-carat-1-w"
-                        },
-                    text: false
-                }).next().button({
-                        icons: {
-                                primary: "ui-icon-carat-1-e"
-                        },
-                    text: false
-                });
-                content.find(".messages-controll").buttonset();
-                content.find(".message-tags").button({
-                    icons: {
-                        primary: "ui-icon-tag",
-                        secondary: "ui-icon-triangle-1-s"
-                    },
-                    text: false
-                }).next().button({
-                    icons: {
-                        secondary: "ui-icon-triangle-1-s"
-                    },
-                    text: true
-                }).next().button({
-                    icons: {
-                        primary: "ui-icon-trash"
-                    },
-                    text: false
-                });
-                content.find(".messages-preferences").button({
-                    icons: {
-                        primary: "ui-icon-gear",
-                        secondary: "ui-icon-triangle-1-s"
-                    },
-                    text: false
-                }).css("width", "45px");
+                        createTab(sbj, 'message', content.html(), id_msg_read, function(content){
+                                buildMessageButtons(content);
             });
+            return;
 
                         //$(".message-flags").buttonset();
@@ -709 +618 @@
         }
         setTimeout('resizeWindow()',300);
+}
+
+function buildMessageButtons(content){
+        var data = getTabData();
+        //FLAGS BUTTON SET 
+    content.find(".message-flags").find(".message-important-flag").button({
+        icons: {
+                primary: "ui-icon-notice"
+        },
+        text: false
+    }).click(function(){
+        var checked = $(this).attr("checked") == "checked" ? true : false;
+        set_message_flag(data.id, checked ? "flagged" : "unflagged", undefined, data.folder);
+        write_msg(get_lang('Message marked as ') + get_lang( checked ? "Important" : "Normal"));
+        refresh();
+    }).end().find(".message-unread-flag").button({
+        icons: {
+                primary: "ui-icon-mail-closed"
+        },
+        text: false
+    }).click(function(){
+        var checked = $(this).attr("checked") == "checked" ? true : false;
+        set_message_flag(data.id, checked ? "unseen" : "seen", undefined, data.folder);
+        write_msg(get_lang('Message marked as ') + get_lang( checked ? "Unseen" : "Seen"));
+        refresh();
+    }).end().find(".message-spam-flag").button({
+        icons: {
+                primary: "ui-icon-alert"
+        },
+        text: false     
+    }).click(function(){
+        var checked = $(this).attr("checked") == "checked" ? true : false;
+        checked ? spam(data.folder, data.id,'null') : nospam(data.id,'null', data.folder);
+        removeTab();
+        refresh();
+    }).end().find(".message-followup-flag").button({
+        icons: {
+                primary: "ui-icon-flag"
+        },
+        text: false
+    });
+    content.find(".message-flags").buttonset();
+
+    //MESSAGES ACTION NEXT PREV BUTTON SET
+    content.find(".messages-controll").find(".message-prev").button({
+        icons: {
+                primary: "ui-icon-carat-1-w"
+        },
+        text: false
+    }).click(function(){
+
+    }).next().button({
+        icons: {
+                primary: "ui-icon-carat-1-e"
+        },
+        text: false
+    });
+    content.find(".messages-controll").buttonset();
+
+    //
+    content.find(".message-forward").button({
+        icons:{
+                primary: "ui-icon-arrowreturnthick-1-e"
+        },
+        text : false
+    });
+
+        var teste = content.find(".message-reply-menu-content").clone();
+        content.find(".message-reply-menu-content").remove();
+
+    content.find(".button.message-reply").button({
+        icons:{
+                primary: "ui-icon-arrowreturnthick-1-w"
+        },
+        text : false
+    }).next().button({
+        icons:{
+                primary: "ui-icon-triangle-1-s"
+        },
+        text : false
+    }).parent().buttonset();
+
+        content.find("span.message-reply").append(teste);
+
+        content.find(".message-reply").next().menuPlugin({
+                content : content.find(".message-reply-menu-content").html(),
+                positionOpts: {
+                        posX: 'left', 
+                        posY: 'bottom',
+                        offsetX: -140,
+                        offsetY: 0,
+                        directionH: 'right',
+                        directionV: 'down', 
+                        detectH: true, // do horizontal collision detection  
+                        detectV: true, // do vertical collision detection
+                        linkToFront: false
+                },
+                flyOut: true,
+                showSpeed: 100,
+                crumbDefaultText: '>'
+        });
+
+
+    content.find(".button.message-edit").button({
+        icons:{
+                primary: "ui-icon-pencil"
+        },
+        text : false
+    });
+    //BUTTON MORE AND TAGS
+    content.find(".message-tags").button({
+        icons: {
+            primary: "ui-icon-tag",
+            secondary: "ui-icon-triangle-1-s"
+        },
+        text: false
+    }).next().next().button({
+        icons: {
+            secondary: "ui-icon-triangle-1-s"
+        },
+        text: true
+        });
+
+        content.find(".message-more").menuPlugin({
+                content : content.find(".message-more-menu-content").html(),
+                flyOut: true,
+                positionOpts: {
+                        posX: 'left', 
+                        posY: 'bottom',
+                        offsetX: -140,
+                        offsetY: 0,
+                        directionH: 'right',
+                        directionV: 'down', 
+                        detectH: true, // do horizontal collision detection  
+                        detectV: true, // do vertical collision detection
+                        linkToFront: false
+                },
+                showSpeed: 100,
+                crumbDefaultText: '>'
+        });
+                
+        content.find(".message-tags-menu-content ul li").remove();
+        $.each(getLabels(), function(key,value){
+                content.find(".message-tags-menu-content ul")
+                .append("<li id='"+key+"'><a href='#'>"+value.name+"</a></li>").find("li:last").click(function(){
+                        if(typeof(value.callback) != "function"){
+                                var isLabel = key.match(/label(.*)/);
+                                if (isLabel && isLabel.length > 1) {
+                                        labeledMessages(isLabel[1]);
+                                }
+                        }
+                });
+        });
+
+        content.find(".message-tags").menuPlugin({
+                content : content.find(".message-tags-menu-content").html(),
+                flyOut: true,
+                positionOpts: {
+                        posX: 'left', 
+                        posY: 'bottom',
+                        offsetX: -140,
+                        offsetY: 0,
+                        directionH: 'right',
+                        directionV: 'down', 
+                        detectH: true, // do horizontal collision detection  
+                        detectV: true, // do vertical collision detection
+                        linkToFront: false
+                },
+                showSpeed: 100,
+                crumbDefaultText: '>'
+        });
+    //REMOVE MESSAGE BUTTON
+    content.find(".message-remove").button({
+        icons: {
+            primary: "ui-icon-trash"
+        },
+        text: false
+    }).click(function(){
+        proxy_mensagens.delete_msgs(data.folder,data.id,'null');
+        removeTab();
+        refresh();
+    });
+
+    //PREFERENCES BUTTON
+    content.find(".messages-preferences").button({
+        icons: {
+            primary: "ui-icon-gear",
+            secondary: "ui-icon-triangle-1-s"
+        },
+        text: false
+    }).css("width", "45px");
+
+    //MESSAGE DETAILS 
+    content.find(".message-hide-show-details").click(function(){
+        $(this).find("span").toggle();
+        content.find(".message-details").toggle("blind");
+    }).hover(
+                function(){
+                        $(this).addClass("message-detail-hover");
+                },
+                function(){
+                        $(this).removeClass("message-detail-hover");
+                }
+        );
+
 }
 
@@ -978 +1092 @@
                                         return move_search_msgs('content_id_'+currentTab,userTrashFolder,special_folders['Trash']); 
                                         
-                                if(currentTab.toString().indexOf("_r") != -1) 
-                                        msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r")); 
+//                              if(currentTab.toString().indexOf("_r") != -1) 
+//                                      msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r")); 
                          
                         if (!archive && (parseInt(preferences.save_deleted_msg)) && (folder != userTrashFolder)){ 
@@ -1371 +1485 @@
                                 delete_border(data.border_ID,'false');
                 }
-                if(folder == get_current_folder()){
+//              if(folder === get_current_folder()){
                         var n_total_msg = parseInt(Element('tot_m').innerHTML) - data.msgs_number.length;
                         draw_paging(n_total_msg);
                         Element('tot_m').innerHTML = n_total_msg;
-                }
+//              }
                 refresh();
         }
@@ -1399 +1513 @@
 
         // se a aba estiver aberta e selecionada, apenas a msg da aba ￜ movida
-        if(currentTab.toString().indexOf("_r") != -1 && currentTab == border_ID)
+        /*if(currentTab.toString().indexOf("_r") != -1 && currentTab == border_ID)
         {
                 //se a aba for aberta atraves de uma pesquisa
@@ -1406 +1520 @@
                 else
                     msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf('_r'));
-        }
+        }*/
         refresh();
         if (parseInt(msgs_number) > 0 || msgs_number.length > 0){
@@ -1430 +1544 @@
                                         delete selectedPagingMsgs[value];
                                     });
-                                    totalFolderMsgs -= msgs_number.split(",").length;
+                                    totalFolderMsgs -= msgs_number+"".split(",").length;
 
                                     //TESTE
@@ -1595 +1709 @@
 
          if( !id_msgs ){
-              write_msg( "Todas as mensagens jￜ foram arquivadas anteriormente." );
+              write_msg( "Todas as mensagens já foram arquivadas anteriormente." );
               return;
           }
@@ -2273 +2387 @@
         $("#border_id_" + new_border_ID).attr("title", title);
 //      set_border_caption("border_id_" + new_border_ID, title);
-//      resizeWindow();
+        resizeWindow();
         return new_border_ID; //Preciso retornar o ID da nova mensagem.
 }
@@ -3270 +3384 @@
 // Get checked messages
 function set_messages_flag(flag, msgs_to_set){  
-        if(currentTab != 0 && currentTab.indexOf("search_local")  >= 0){
-                return set_messages_flag_search_local(flag);
-        }
-        if (currentTab != 0 && currentTab.indexOf("search_")  >= 0){
+        if(indexTab() != 0){
                 return set_messages_flag_search(flag);
         }
@@ -3365 +3476 @@
         if (msgs_to_set == 'get_selected_messages')
                 var msgs_to_set = this.get_selected_messages();
-        else
+        else{
                 folder = Element("input_folder_"+msgs_to_set+"_r").value;
-        
+    }
+
         if (msgs_to_set)
                 $.ajax({
@@ -3397 +3509 @@
 
 // By message number
-function set_message_flag(msg_number, flag, func_after_flag_change){
+function set_message_flag(msg_number, flag, func_after_flag_change, folder){
         var msg_number_folder = Element("new_input_folder_"+msg_number+"_r"); //Mensagens respondidas/encaminhadas
         if(!msg_number_folder)
@@ -3440 +3552 @@
         $.ajax({
                   url: 'controller.php?' + $.param( {action: '$this.imap_functions.set_messages_flag',
-                                                      folder: ( msg_number_folder ?  msg_number_folder.value : get_current_folder() ),
+                                                      folder: folder ? folder : ( msg_number_folder ?  msg_number_folder.value : get_current_folder() ),
                                                       msgs_to_set: msg_number,
                                                       flag: flag,
@@ -3914 +4026 @@
         }
 
-        if(currentTab.toString().indexOf("_r") != -1)
+        /*if(currentTab.toString().indexOf("_r") != -1)
                 msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
         else if(msgs_number == 'selected')
                 msgs_number = get_selected_messages();
-
+        */
         //TODO: REFATORAR O CￜDIGO PARA EVITAR recodificaￜￜo
         if(currentTab == 0)
@@ -3952 +4064 @@
         }
 
-        if(currentTab.toString().indexOf("_r") != -1)
-                msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
-        else if(currentTab != 0 && currentTab.indexOf("search_")  >= 0){
-                var content_search = document.getElementById('content_id_'+currentTab);mount_url_folder(["INBOX",special_folders['Trash']]), 'Trash',
-                move_search_msgs('content_id_'+currentTab,  mount_url_folder(["INBOX",special_folders["Spam"]]), special_folders['Spam']);
-                refresh();
-                return;
-        }else if(msgs_number == 'selected')
-                msgs_number = get_selected_messages();
-
-        //TODO: REFATORAR O CￜDIGO PARA EVITAR recodificaￜￜo
-        if(currentTab == 0)
-                msgs_number = get_selected_messages();
-
+        if(!msgs_number){
+                if(currentTab.toString().indexOf("_r") != -1)
+                        msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
+                else if(currentTab != 0 && currentTab.indexOf("search_")  >= 0){
+                        var content_search = document.getElementById('content_id_'+currentTab);mount_url_folder(["INBOX",special_folders['Trash']]), 'Trash',
+                        move_search_msgs('content_id_'+currentTab,  mount_url_folder(["INBOX",special_folders["Spam"]]), special_folders['Spam']);
+                        refresh();
+                        return;
+                }else if(msgs_number == 'selected')
+                        msgs_number = get_selected_messages();
+
+                //TODO: REFATORAR O CￜDIGO PARA EVITAR recodificaￜￜo
+                if(currentTab == 0)
+                        msgs_number = get_selected_messages();
+        }
         if(parseInt(msgs_number) > 0 || msgs_number.length > 0)
                 cExecute ("$this.imap_functions.spam&folder="+folder+"&spam=true"+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+new_folder+"&new_folder_name="+new_folder_name+"&get_previous_msg="+0+"&cyrus_delimiter="+cyrus_delimiter, handler_move_msgs);
@@ -4568 +4681 @@
             var border_id = form.abaID;  
             //Defininindo pasta a ser salva mensagem
-                        var user_selected = $('#content_id_'+border_id).find('.from-select option:selected').text();
+                        var user_selected = $('#ptabs_'+border_id).find('.from-select option:selected').text();
                         var str_begin_name = user_selected.indexOf('<') + 1;
                         var str_end_name = user_selected.indexOf('@');
@@ -4598 +4711 @@
                         form.type =  RichTextEditor.plain[border_id] ? 'plain' : 'html';            
             form.attachments = listAttachment(border_id);
+            uidsSave[border_id] = [];
             form.uidsSave = uidsSave[border_id].toString();
             return( form );
@@ -4684 +4798 @@
 
 
+function addAttachment(ID, att)
+{
+    if(typeof(msgAttachments[ID]) == 'undefined')
+            msgAttachments[ID] = [];
+
+        msgAttachments[ID].push(att);
+}
+
+function delAttachment(ID, att)
+{
+    
+    if(msgAttachments[ID] == undefined) return;
+    var len = msgAttachments[ID].length;
+    for(var i = 0; i < len; i++)
+    {
+        if(msgAttachments[ID][i] == att)
+        {
+            delete msgAttachments[ID][i];
+            break;
+        }
+    }  
+}
+
+function listAttachment(ID)
+{
+   return (typeof(msgAttachments[ID]) == 'undefined') ? '' : JSON.stringify(msgAttachments[ID]); 
+}