Changeset 5257

Timestamp:

12/15/11 08:40:50 (12 years ago)

Author:

douglasz

Message:

Ticket #2362 - Retirar inclusao do proprio rementente na acao de responder a todos

File:

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

trunk/expressoMail1_2/js/main.js

@@ -1445 +1445 @@
                                 }
                         }
-                        for(i = 0; i < _array_to_alternative.length; i++) {
-                                for(k = 0; k < data.to_all.length; k++){
-                                        if(data.to_all[k].replace(/^\s+|\s+$/g,"").toLowerCase() == _array_to_alternative[i].toLowerCase())
-                                                data.to_all.splice( k , 1);
-                                }
-                        }
+                        data.to_all = removeAlternative(data.to_all,_array_to_alternative);
+
                         data.to_all = data.to_all.join(",");
 
@@ -1465 +1461 @@
                                         }
                                 }
-                                for(i = 0; i < _array_to_alternative.length; i++) {
-                                for(k = 0; k < data.cc.length; k++){
-                                        if(data.cc[k].replace(/^\s+|\s+$/g,"").toLowerCase() == _array_to_alternative[i].toLowerCase())
-                                                data.cc.splice( k , 1);
-                                        }
-                                }
+                                data.cc = removeAlternative(data.cc,_array_to_alternative);
+        
                                 Element("cc_" + new_border_ID).value = data.cc;
                                 Element("a_cc_link_" + new_border_ID).style.display='none';
@@ -1504 +1496 @@
                                 }
                         }
-                        for(i = 0; i < _array_to_alternative.length; i++) {
-                                for(k = 0; k < data.to_all.length; k++){
-                                        if(data.to_all[k].replace(/^\s+|\s+$/g,"").toLowerCase() == _array_to_alternative[i].toLowerCase())
-                                                data.to_all.splice( k , 1);
-                                }
-                        } 
+                        data.to_all = removeAlternative(data.to_all,_array_to_alternative);
+
                         if (data.to_all != get_lang("undisclosed-recipient"))
                                 data.to_all = data.to_all.join(",");
@@ -1527 +1515 @@
                                         }
                                 }
-                                for(i = 0; i < _array_to_alternative.length; i++) {
-                                        for(k = 0; k < data.cc.length; k++){
-                                                if(data.cc[k].replace(/^\s+|\s+$/g,"").toLowerCase() == _array_to_alternative[i].toLowerCase())
-                                                        data.cc.splice( k , 1);
-                                        }
-                                }
+                                data.cc = removeAlternative(data.cc,_array_to_alternative);
+
                                 if (data.cc != get_lang("undisclosed-recipient"))
                                                 data.cc = data.cc.join(",");
@@ -1749 +1733 @@
         //save_msg(new_border_ID);
         return new_border_ID; //Preciso retornar o ID da nova mensagem.
+}
+
+//Revome os emails alternativos ao responder a todos
+function removeAlternative(value_to_all, _array_to_alternative){
+        for(i = 0; i < _array_to_alternative.length; i++) {
+                for(k = 0; k < value_to_all.length; k++){
+                        if(value_to_all[k].match(/<([^<]*)>[\s]*$/)){
+                                if(value_to_all[k].match(/<([^<]*)>[\s]*$/)[1].toLowerCase() == _array_to_alternative[i].toLowerCase()){
+                                        value_to_all.splice( k , 1);
+                                        k--;
+                                }
+                        }else if(value_to_all[k].replace(/^\s+|\s+$/g,"").toLowerCase() == _array_to_alternative[i].toLowerCase()){
+                                        value_to_all.splice( k , 1);
+                                        k--;
+                        }
+                }
+        }
+        return value_to_all;
 }