Changeset 5158 for trunk/expressoMail1_2/js

Timestamp:

11/08/11 15:30:53 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus. Ultimas sincronizacoes

Location:

trunk/expressoMail1_2/js

Files:

• TreeShow.js (modified) (2 diffs)
• draw_api.js (modified) (3 diffs)
• main.js (modified) (7 diffs)
• messages_controller.js (modified) (5 diffs)
• rich_text_editor.js (modified) (2 diffs)

trunk/expressoMail1_2/js/TreeShow.js

@@ -112 +112 @@
                                                 return false; //Não posso criar pastas contendo a string local_                                 
                                         }
-                                        if(button.match(/[\/\\\!\@\#\$\%\&\*\(\)]/gi)){
+                                        if(button.match(/[\/\\\!\@\#\$\%\&\*\+\(\)]/gi)){
                                             alert(get_lang("cannot create folder. try other folder name"));
                                             return false;
@@ -138 +138 @@
                                         }
 
-                                        if(button1.match(/[\/\\\!\@\#\$\%\&\*\(\)]/gi)){
+                                        if(button1.match(/[\/\\\!\@\#\$\%\&\*\+\(\)]/gi)){
                                             alert(get_lang("It's not possible rename this folder. try other folder name"));
                                             return false;

trunk/expressoMail1_2/js/draw_api.js

@@ -1366 +1366 @@
                     test = false;
 
-                if( (headers_msgs.from != undefined) && headers_msgs.from.email.toLowerCase() == Element("user_email").value.toLowerCase() && !(preferences.from_to_sent == "1" && test) && !(msg_folder.substr(0,5) == "user/"))
+                if( (headers_msgs.from != undefined) && headers_msgs.from.email.toLowerCase() == Element("user_email").value.toLowerCase() && (preferences.from_to_sent == "1") && !(msg_folder.substr(0,5) == "user/"))
                 {
                         td_element3.onmouseover = function () {this.title=headers_msgs.to.email;};
@@ -1395 +1395 @@
                                 spanSender.onmouseover = function (event) {this.style.textDecoration = "underline";try {InfoContact.begin(this,headers_msgs.from.email)} catch(e){};};
                                 spanSender.onmouseout = function (){try {this.style.textDecoration = "none";clearTimeout(InfoContact.timeout);} catch(e){}};
-                                if ( headers_msgs.from !== undefined )
+                                folder = special_folders['Sent'];
+                                current = get_current_folder();
+                                if ((preferences.from_to_sent == "1") && (current.substr(current.length - folder.length, folder.length) == folder)){
+                                        if (headers_msgs.to) {
+                                                if (headers_msgs.to.name != null){
+                                                        spanSender.innerHTML += headers_msgs.to.name;
+                                                }else if(headers_msgs.to.email != null) {
+                                                        spanSender.innerHTML += headers_msgs.to.email;
+                                                }
+                                        }
+                                }else if(headers_msgs.from !== undefined){
                                 spanSender.innerHTML =  headers_msgs.from.name != null ? headers_msgs.from.name : headers_msgs.from.email;
+                                }
                                 if (spanSender.innerHTML.indexOf(" ") == '-1' && spanSender.innerHTML.length > 25){
                                         spanSender.innerHTML = spanSender.innerHTML.substring(0,25) + "...";
@@ -1550 +1561 @@
                         break;
         }
+        folder = special_folders['Sent'];
+        current = get_current_folder();
+        if ((preferences.from_to_sent == "1") && (current.substr(current.length - folder.length, folder.length) == folder)) {
+        document.getElementById("message_header_SORTFROM_"+numBox).innerHTML    = get_lang("To");
+    }else{
         document.getElementById("message_header_SORTFROM_"+numBox).innerHTML    = get_lang("From");
+    }
         document.getElementById("message_header_SORTSUBJECT_"+numBox).innerHTML = get_lang("Subject");
         document.getElementById("message_header_SORTARRIVAL_"+numBox).innerHTML = get_lang("Date");

trunk/expressoMail1_2/js/main.js

@@ -405 +405 @@
 
 function refresh(alert_new_msg){
+
         var handler_refresh = function(data){
+                
+                if(data['msg_range_end'])
+                        if(data['msg_range_end'] > 0)
+                                current_page = data['msg_range_end']/preferences.max_email_per_page;
                 if(!verify_session(data))
                         return;
@@ -850 +855 @@
                     msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf('_r'));
         }
-
+        refresh();
         if (parseInt(msgs_number) > 0 || msgs_number.length > 0){
                 if(!not_opem_previus){
@@ -1168 +1173 @@
                 data.cc = data.cc.replace(/&lt;/gi,"<");
                 data.cc = data.cc.replace(/&gt;/gi,">");
+                var _array_cc = data.cc.split(",");
         }
         if (document.getElementById("cco_" + border_ID)){
@@ -1308 +1314 @@
                         Element("to_" + new_border_ID).value = data.to;
                         Element("to_" + new_border_ID).value += ', ' + data.to_all;
+                        
                         if (data.cc){
+                        data.cc = new Array();
+                        var j = 0;
+                                for(i = 0; i < _array_cc.length; i++) {
+                                if(_array_cc[i].lastIndexOf(Element("user_email").value) == "-1"){
+                                        data.cc[j++] = _array_cc[i];
+                                }
+                        }
+                        if (data.cc != get_lang("undisclosed-recipient"))
+                                data.cc = data.cc.join(",");
+                        else
+                                                                data.cc = "";                   
                                 document.getElementById("cc_" + new_border_ID).value = data.cc;
                                 document.getElementById("a_cc_link_" + new_border_ID).style.display='none';
@@ -1503 +1521 @@
                 default:
         }
-
-        
+        //Insere o conteúdo da mensagem e a assinatura no editor de texto simples
+     if (preferences.plain_text_editor == 1){
+           Element('textplain_rt_checkbox_'+new_border_ID).checked = true;
+           var txtarea = Element('body_'+new_border_ID);
+           if (txtarea != null){
+                   if (data.body != undefined)
+                    txtarea.value = data.body;
+              if (preferences.use_signature == "1")
+            txtarea.value += '\n' + signature;     
+       }
+         } 
         Element("border_id_" + new_border_ID).title = title;
         set_border_caption("border_id_" + new_border_ID, title);
@@ -2382 +2409 @@
 
         var folder= Element('border_id_0').innerHTML;
-        var thead = Element('divScrollHead_'+numBox).firstChild.firstChild.innerHTML;
+        //var thead = Element('divScrollHead_'+numBox).firstChild.firstChild.innerHTML; 
         
         msgs_number = get_selected_messages();
@@ -2399 +2426 @@
         var window_print = window.open('','ExpressoMail','width='+print_width+',height=400,resizable=yes,scrollbars=yes,left='+x+',top='+y);
         seekDot = (is_ie ? /width=24/gi : /width="24"/gi);
-        thead = thead.replace(seekDot, "style='display:none'");
+        //thead = thead.replace(seekDot, "style='display:none'"); 
+        var thead = "<tr class=\"message_header\"><td id=\"message_header_SORTFROM_0\" class=\"th_resizable\" align=\"left\" width=\"20%\">De</td><td id=\"message_header_SORTSUBJECT_0\" class=\"th_resizable\" align=\"left\" width=\"*\">Assunto</td><td id=\"message_header_SORTARRIVAL_0\" class=\"th_resizable\" align=\"center\" width=\"11%\"><b>Data</b><img src=\"templates/default/images/arrow_descendant.gif\"></td><td id=\"message_header_SORTSIZE_0\" class=\"th_resizable\" align=\"left\" width=\"11%\">Tamanho</td></tr>";
         tbody = tbody.replace(seekDot, "style='display:none'");
         seekDot = (is_ie ? /width=16/gi : /width="16"/gi);
-        thead = thead.replace(seekDot, "style='display:none'");
+        //thead = thead.replace(seekDot, "style='display:none'"); 
         tbody = tbody.replace(seekDot, "style='display:none'");
         seekDot = (is_ie ? /width=12/gi : /width="12"/gi);
-        thead = thead.replace(seekDot, "style='display:none'");
+        //thead = thead.replace(seekDot, "style='display:none'"); 
         tbody = tbody.replace(seekDot, "style='display:none'");
-        thead = thead.replace("<td style=\"cursor: pointer;\"></td>", "");              
-        thead = thead.replace("<td style=\"cursor: pointer;\" style='display:none'><input title=\"Selecionar todas as mensagens.\" class=\"checkbox\" id=\"chk_box_select_all_messages\" type=\"checkbox\"></td>", "");
         while (1){
                 try{

trunk/expressoMail1_2/js/messages_controller.js

@@ -54 +54 @@
                                 this.aux_interface_remove_mails(msgs_number, 'local_Trash', border_ID);
                                 draw_tree_local_folders();
+                                update_local_box(); 
                                 refresh(); 
                         }else{
                         expresso_local_messages.delete_msgs(msgs_number, border_ID);
                         draw_tree_local_folders();
+                                update_local_box(); 
                                 refresh();
                         }
@@ -131 +133 @@
                 if (this.is_local_folder(ttree.FOLDER)) {
                         folder = prompt(get_lang("Enter a name for the box"), "");
-                        if(folder.match(/[\/\\\!\@\#\$\%\&\*\(\)]/gi)){
+                        if(folder.match(/[\/\\\!\@\#\$\%\&\*\+\(\)]/gi)){
                             alert(get_lang("It's not possible rename this folder. try other folder name"));
                             return false;
@@ -167 +169 @@
                                 return false;
                         }
-                        if(folder.match(/[\/\\\!\@\#\$\%\&\*\(\)]/gi)){
+                        if(folder.match(/[\/\\\!\@\#\$\%\&\*\+\(\)]/gi)){
                             alert(get_lang("cannot create folder. try other folder name"));
                             return false;
@@ -345 +347 @@
                         }
                 }
+                new_folder_name = this.get_folder_name(new_folder_name);
                 if (msgs_number.length == 1)
                         write_msg(get_lang("The message was moved to folder ") + new_folder_name);
@@ -363 +366 @@
         }
 
+        messages_proxy.prototype.get_folder_name = function(new_folder_name){
+                switch (new_folder_name) {
+                        case 'local_Inbox':
+                                return 'Local_Caixa de Entrada';
+                        case 'local_Sent':
+                                return 'Local_Enviados';
+                        case 'local_Trash':
+                                return 'Local_Lixeira';
+                        case 'local_Drafts':
+                                return 'Local_Rascunhos';
+                        default:
+                                return new_folder_name;
+                }
+        }
+        
         messages_proxy.prototype.msg_img = function(msgs_number,folder_name,call_back) {
      if(this.is_local_folder(folder_name)){

trunk/expressoMail1_2/js/rich_text_editor.js

@@ -104 +104 @@
         
         if(preferences.plain_text_editor == 1)
+            {
           RichTextEditor.plain[ID] = true;  
+                RichTextEditor.editorReady = true;
+            }
         else 
                   RichTextEditor.active(pObj);
@@ -380 +383 @@
            var divBr = '<div style="'+fontSize+fontFamily+'"><br type="_moz"></div>';
           
-           editor.insertHtml(divBr+divBr+divBr+data);
+                    if(reply === undefined)
+                                editor.insertHtml(divBr+divBr+data);
+                        else if(reply == 'edit')
+                                editor.insertHtml(data);
+                        else
+                                editor.insertHtml(divBr+data);
            
            if(selection !== null) selection.selectRanges(selectionRanges);