Changeset 5962 for trunk/expressoMail1_2/js/main.js

Timestamp:

04/18/12 11:28:26 (12 years ago)

Author:

gustavo

Message:

Ticket #2611 - Refatorar interface de criação de nova mensagem

File:

• trunk/expressoMail1_2/js/main.js (modified) (6 diffs)

trunk/expressoMail1_2/js/main.js

@@ -1639 +1639 @@
                         block_quoted_body = make_body_reply(data.body, data.to, data.date_day, data.date_hour);
                         // Insert the signature automaticaly at message body if use_signature preference is set
-                        if (preferences.use_signature == "1")  
-                                RichTextEditor.setInitData(new_border_ID, '<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>' + block_quoted_body,true); 
-                        else
+                        if (preferences.use_signature == "1"){  
+                                RichTextEditor.setInitData(new_border_ID, '<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>' + block_quoted_body,true);                          
+                        }else{
                                 RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>'+ block_quoted_body,true);
+                        }
                         break;
                 case "reply_to_all_without_history":
@@ -1681 +1682 @@
                         
                         useOriginalAttachments(new_border_ID,border_ID);  
-                        if (preferences.use_signature == "1")  
+                        if (preferences.use_signature == "1"){  
                                 RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>' + signature,true);
+                        }
                                 
                         break;
@@ -1723 +1725 @@
                         block_quoted_body = make_body_reply(data.body, data.to, data.date_day, data.date_hour);
                         
-                        if (preferences.use_signature == "1")  
+                        if (preferences.use_signature == "1"){  
                                 RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ block_quoted_body,true); 
-                        else                   
+                        }else{                
                                 RichTextEditor.setInitData(new_border_ID,block_quoted_body,true); 
+                        }
                                 
                         break;
@@ -1739 +1742 @@
                         
                         // Insert the signature automaticaly at message body if use_signature preference is set
-                        if (preferences.use_signature == "1")  
-                                            RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc)); 
-                                        else   
-                                            RichTextEditor.setInitData(new_border_ID,make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc));   
+                        if (preferences.use_signature == "1"){ 
+                                $("#body_"+new_border_ID).val('<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc));
+                        RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc)); 
+                                content.find(".to").focus();
+                        }
+                        else{   
+                                $("#body_"+new_border_ID).val(make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc));
+                                RichTextEditor.setInitData(new_border_ID,make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc));   
+                                content.find(".to").focus();
+                        }
 
                         break;
@@ -1765 +1774 @@
                         
                         // Insert the signature automaticaly at message body if use_signature preference is set
-                         if (preferences.use_signature == "1") 
+                         if (preferences.use_signature == "1"){ 
+                                $("#body_"+new_border_ID).val('<div><br type="_moz"></div>' + signature);
                                 RichTextEditor.setInitData(new_border_ID, '<div><br type="_moz"></div>' + signature);
+                                content.find(".to").focus();
+                         }
                          else
                            content.find('[name="input_to"]').focus(); 
@@ -1823 +1835 @@
                         if (Element("attachments_" + border_ID))
                                 addOriginalAttachments(new_border_ID,border_ID);
-                         
                         RichTextEditor.setInitData(new_border_ID, data.body, 'edit');
-      
                         break;
                 default: