Changeset 6882 for trunk/expressoMail1_2/js

Timestamp:

07/26/12 11:49:17 (12 years ago)

Author:

marcosw

Message:

Ticket #2897 - Realizado backport da funcionalidade Responder a

Location:

trunk/expressoMail1_2/js

Files:

• draw_api.js (modified) (4 diffs)
• main.js (modified) (9 diffs)

trunk/expressoMail1_2/js/draw_api.js

@@ -2813 +2813 @@
                 reply_to_values.type = "HIDDEN";
                 reply_to_values.value = info_msg.reply_to; //Veio do IMAP, sem images nem links.
-                reply_to.innerHTML = draw_plugin_cc(ID, info_msg.reply_to);
+                $.each(break_comma(info_msg.reply_to), function(index, value){
+                        reply_to.innerHTML += draw_plugin_cc(ID, value);        
+                })
                 reply_to.className = "header_message_field";
                 tr11.appendChild(td11);
@@ -2887 +2889 @@
                 cc_values.value = info_msg.cc;
 
-                ccaddress_array[ID] = info_msg.cc.split(",");
+                ccaddress_array[ID] = break_comma(info_msg.cc);
                 if (ccaddress_array[ID].length > 1){
                         var div_ccaddress = document.createElement("SPAN");
@@ -3367 +3369 @@
          //window.setTimeout(function() { $("#div_message_scroll_"+ID).focus() },250);
         
-        /*
-         * @AUTHOR Marcos Luiz Wilhelm
-         * @DATE 2012/07/17
-         * @BRIEF Break out emails only with comma out of quote marks
-         */
-        function break_comma (originalText){
-                var quotesMarks = false;
-                var completeString = "";
-                var brokenEmails = new Array();
-                originalText+=",";
-                for(i=0; i<originalText.length; i++){
-                        var character = originalText.substr(i,1);
-                        if(character == "\""){
-                                quotesMarks = !quotesMarks;
-                        }
-                        if(!quotesMarks){
-                                if(character == ","){
-                                        brokenEmails.push(completeString);
-                                        completeString = "";
-                                }
-                                else
-                                        completeString+=character;      
-                        }
-                        else
-                                completeString+=character;
-                }
-                return brokenEmails;
-        }
-
         function mailto( link )
         {
@@ -4345 +4318 @@
                 change_text($(this).find(".ui-button-text"), get_lang("Add CC"), get_lang('Remove CC'));
         })
+    //Botão Responder a
+    .end().filter(".reply-to-button").click(function(){
+        show_hide(content.find(".reply-to-tr"), $(this));
+    });
         
         //BOTAO ENVIAR

trunk/expressoMail1_2/js/main.js

@@ -1819 +1819 @@
         if (document.getElementById("body_" + border_ID))
                 data.body = document.getElementById("body_" + border_ID).innerHTML;
+        if (document.getElementById("from_values_" + border_ID))
+                data.from = document.getElementById("from_values_"+border_ID).value;
         if (Element('date_' + border_ID)){
                 data.date = Element('date_' + border_ID).innerHTML;
@@ -1842 +1844 @@
         var content = $("#content_id_"+new_border_ID);
 
-        
 switch(type){
                 case "reply_without_history":
@@ -1861 +1862 @@
                         break;
                 case "reply_with_history":
-
                         RichTextEditor.replyController = true; //Seta o editor como modo reply 
                         title = "Re: " + html_entities(data.subject);
@@ -1868 +1868 @@
                         
                         draw_reply_boxes_by_field("to", data.to, content);
-                        
                         content.find('[name="msg_reply_from"]').val($("#msg_number_" + border_ID).val());       
-
-                        block_quoted_body = make_body_reply(data.body, data.to, data.date_day, data.date_hour);
+                        block_quoted_body = make_body_reply(data.body, data.from, data.date_day, data.date_hour);
                         
                         useOriginalAttachments(new_border_ID,border_ID);
@@ -1971 +1969 @@
                         content.find(".subject").val("Re: " + data.subject);
                         
-                        block_quoted_body = make_body_reply(data.body, data.to, data.date_day, data.date_hour);
+                        block_quoted_body = make_body_reply(data.body, data.from, data.date_day, data.date_hour);
                         
                         useOriginalAttachments(new_border_ID,border_ID);
@@ -2111 +2109 @@
 //DESENHA OS RETANGULOS PARA OS E-MAIL NA OPÇÃO REPLY
 function draw_reply_boxes_by_field(field, value, context){
-        array = value.split(",");
+        array = break_comma(value);
         $.each(array, function(index, value){
                 draw_email_box(value, context.find("."+field).filter("input"));
@@ -2708 +2706 @@
         //stringEmail = content.find('[name="input_to"]').val();
 
+    var stringReply = "";
+    var array = content.find(".reply-to-tr").find(".box");
+    $.each(array, function(index, value){
+        stringReply += $(value).find("input").val() + ",";
+    });
+    content.find('[name="input_reply_to"]').val(stringReply);
+
         var stringEmail = "";
         var stringToEmail = "";
@@ -2845 +2850 @@
    ///////////////////////////////////////////
     var content = $("#content_id_"+border_id);
+        
+
+    var array = content.find(".reply-to-tr").find(".box");
+    var stringReplyToEmail = "";
+    $.each(array, function(index, value){
+        stringReplyToEmail += $(value).find("input").val() + ",";
+    });
+    content.find('[name="input_reply_to"]').val(stringReplyToEmail);
 
         var stringEmail = "";
@@ -4296 +4309 @@
 }
 
+/*
+* @author Marcos Luiz Wilhelm (marcoswilhelm@gmail.com)
+* @date 2012/07/17
+* @brief Break out emails only with comma out of quote marks
+*/
+function break_comma (originalText){
+        var quotesMarks = false;
+        var completeString = "";
+        var brokenEmails = new Array();
+        originalText+=",";
+        for(i=0; i<originalText.length; i++){
+                var character = originalText.substr(i,1);
+                if(character == "\""){
+                        quotesMarks = !quotesMarks;
+                }
+                if(!quotesMarks){
+                        if(character == ","){
+                                brokenEmails.push(completeString);
+                                completeString = "";
+                        }
+                        else
+                                completeString+=character;      
+                }
+                else
+                        completeString+=character;
+        }
+        return brokenEmails;
+}
+
 DataLayer.links('message');
 DataLayer.poll('message',30);