Changeset 5408
- Timestamp:
- 01/20/12 10:50:50 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/main.js
r5403 r5408 1448 1448 // delete user email from to_all array. 1449 1449 data.to_all = new Array(); 1450 var j = 0; 1451 for(i = 0; i < _array_to_all.length; i++) { 1452 if(_array_to_all[i].lastIndexOf(Element("user_email").value) == "-1"){ 1453 data.to_all[j++] = _array_to_all[i]; 1454 } 1455 } 1450 data.to_all = removeUserEmail(_array_to_all); 1456 1451 data.to_all = removeAlternative(data.to_all,_array_to_alternative); 1457 1452 … … 1460 1455 title = "Re: " + data.subject; 1461 1456 Element("subject_" + new_border_ID).value = "Re: " + data.subject; 1462 Element("to_" + new_border_ID).value = data.to; 1463 Element("to_" + new_border_ID).value += ', ' + data.to_all; 1457 1458 if (data.to.indexOf(Element("user_email").value) > 0 ) 1459 Element("to_" + new_border_ID).value = data.to_all; 1460 else 1461 Element("to_" + new_border_ID).value = data.to + ',' + data.to_all; 1462 //Element("to_" + new_border_ID).value = data.to; 1463 //Element("to_" + new_border_ID).value += ', ' + data.to_all; 1464 1464 1465 if (data.cc){ 1465 1466 data.cc = new Array(); 1466 var j = 0; 1467 for(i = 0; i < _array_cc.length; i++) { 1468 if(_array_cc[i].lastIndexOf(Element("user_email").value) == "-1"){ 1469 data.cc[j++] = _array_cc[i]; 1470 } 1471 } 1467 data.cc = removeUserEmail(_array_cc); 1472 1468 data.cc = removeAlternative(data.cc,_array_to_alternative); 1473 1469 … … 1475 1471 Element("a_cc_link_" + new_border_ID).style.display='none'; 1476 1472 Element("tr_cc_" + new_border_ID).style.display=''; 1477 Element('space_link_' + new_border_ID).style.display='none'; 1473 var space_link = Element('space_link_' + new_border_ID); 1474 if (space_link) 1475 space_link.style.display='none'; 1478 1476 } 1479 1477 if (data.is_local_message){ … … 1497 1495 case "reply_to_all_with_history": 1498 1496 RichTextEditor.replyController = true; //Seta o editor como modo reply 1499 // 1497 //delete user email from to_all array. 1500 1498 data.to_all = new Array(); 1501 var j = 0; 1502 for(i = 0; i < _array_to_all.length; i++) { 1503 if(_array_to_all[i].lastIndexOf(Element("user_email").value) == "-1"){ 1504 data.to_all[j++] = _array_to_all[i]; 1505 } 1506 } 1499 data.to_all = removeUserEmail(_array_to_all); 1507 1500 data.to_all = removeAlternative(data.to_all,_array_to_alternative); 1508 1501 1509 1502 if (data.to_all != get_lang("undisclosed-recipient")) 1510 1503 data.to_all = data.to_all.join(","); … … 1512 1505 data.to_all = ""; 1513 1506 title = "Re: " + data.subject; 1514 Element("to_" + new_border_ID).value = data.to;1515 1507 1516 Element("to_" + new_border_ID).value += ', ' + data.to_all; 1517 1508 if (data.to.indexOf(Element("user_email").value) > 0 ) 1509 Element("to_" + new_border_ID).value = data.to_all; 1510 else 1511 Element("to_" + new_border_ID).value = data.to + ',' + data.to_all; 1518 1512 if (data.cc){ 1519 data.cc = new Array(); 1520 var j = 0; 1521 for(i = 0; i < _array_cc.length; i++) { 1522 if(_array_cc[i].lastIndexOf(Element("user_email").value) == "-1"){ 1523 data.cc[j++] = _array_cc[i]; 1524 } 1525 } 1513 data.cc = new Array(); 1514 data.cc = removeUserEmail(_array_cc); 1526 1515 data.cc = removeAlternative(data.cc,_array_to_alternative); 1527 1528 if (data.cc != get_lang("undisclosed-recipient")) 1516 if (data.cc != get_lang("undisclosed-recipient")) 1529 1517 data.cc = data.cc.join(","); 1530 else1518 else 1531 1519 data.cc = ""; 1532 1520 document.getElementById("cc_" + new_border_ID).value = data.cc; 1533 1521 document.getElementById("a_cc_link_" + new_border_ID).style.display='none'; 1534 1522 document.getElementById("tr_cc_" + new_border_ID).style.display=''; 1535 document.getElementById('space_link_' + new_border_ID).style.display='none'; 1523 var space_link = document.getElementById('space_link_' + new_border_ID); 1524 if ( space_link ) 1525 space_link.style.display='none'; 1536 1526 } 1537 1527 document.getElementById("subject_" + new_border_ID).value = "Re: " + data.subject; … … 1746 1736 } 1747 1737 1748 //Revome os emails alternativos ao responder a todos 1738 1739 //Remove o email do usuario ao responder a todos 1740 function removeUserEmail(emailList){ 1741 var userEmail = Element("user_email").value; 1742 var array_emails = Array(); 1743 var j = 0; 1744 for (var i=0;i<emailList.length;i++){ 1745 if (emailList[i].indexOf(userEmail) < 0){ 1746 array_emails[j++] = emailList[i]; 1747 } 1748 } 1749 return array_emails; 1750 } 1751 1752 //Remove os emails alternativos ao responder a todos 1749 1753 function removeAlternative(value_to_all, _array_to_alternative){ 1750 1754 for(i = 0; i < _array_to_alternative.length; i++) {
Note: See TracChangeset
for help on using the changeset viewer.