Changeset 3387 for branches/2.2/expressoMail1_2/js
- Timestamp:
- 10/21/10 11:46:13 (14 years ago)
- Location:
- branches/2.2/expressoMail1_2/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/expressoMail1_2/js/common_functions.js
r3380 r3387 240 240 } 241 241 //ADD forwarded files 242 function addForwardedFile(id_border,file_name,link){ 243 divFiles = document.getElementById("divFiles_"+id_border); 242 function addForwardedFile(id_border,file_name,link,divFiles){ 243 if(!divFiles) 244 divFiles = document.getElementById("divFiles_"+id_border); 244 245 245 246 if (! divFiles) -
branches/2.2/expressoMail1_2/js/main.js
r3372 r3387 965 965 preferences.signature = ""; 966 966 var signature = preferences.type_signature == 'html' ? preferences.signature : preferences.signature.replace(/\n/g, "<br>"); 967 if(type!="new" && type!="edit") 968 data.is_local_message = (document.getElementById("is_local_"+border_ID).value=="1")?true:false; 967 969 switch(type){ 968 970 case "reply_without_history": 969 971 Element("to_" + new_border_ID).value = data.to; 970 972 title = "Re: " + data.subject; 971 Element("subject_" + new_border_ID).value = "Re: " + data.subject; 972 useOriginalAttachments(new_border_ID,border_ID );973 Element("subject_" + new_border_ID).value = "Re: " + data.subject; 974 useOriginalAttachments(new_border_ID,border_ID,data.is_local_message); 973 975 var body = Element("body_" + new_border_ID); 974 976 body.contentWindow.document.open(); … … 1006 1008 Element("subject_" + new_border_ID).value = "Re: " + data.subject; 1007 1009 Element("to_" + new_border_ID).value = data.to; 1008 useOriginalAttachments(new_border_ID,border_ID );1010 useOriginalAttachments(new_border_ID,border_ID,data.is_local_message); 1009 1011 block_quoted_body = make_body_reply(data.body, data.to, data.date_day, data.date_hour); 1010 1012 var body = Element("body_" + new_border_ID); … … 1060 1062 Element('space_link_' + new_border_ID).style.display='none'; 1061 1063 } 1062 useOriginalAttachments(new_border_ID,border_ID );1064 useOriginalAttachments(new_border_ID,border_ID,data.is_local_message); 1063 1065 var body = Element("body_" + new_border_ID); 1064 1066 body.contentWindow.document.open(); … … 1112 1114 } 1113 1115 document.getElementById("subject_" + new_border_ID).value = "Re: " + data.subject; 1114 useOriginalAttachments(new_border_ID,border_ID );1116 useOriginalAttachments(new_border_ID,border_ID,data.is_local_message); 1115 1117 block_quoted_body = make_body_reply(data.body, data.to, data.date_day, data.date_hour); 1116 1118 var body = document.getElementById("body_" + new_border_ID); … … 1372 1374 } 1373 1375 1374 function useOriginalAttachments(new_id_border,old_id_border )1376 function useOriginalAttachments(new_id_border,old_id_border,is_local) 1375 1377 { 1376 1378 var divFiles = Element("divFiles_"+new_id_border); … … 1400 1402 var attachments = document.getElementById("attachments_" + old_id_border).childNodes; 1401 1403 for (var i = (attachments.length > 1 ? 1 : 0); i < attachments.length; i++){ 1402 var link_attachment = document.createElement("A"); 1403 link_attachment.setAttribute("href", attachments[i].href); 1404 link_attachment.innerHTML = attachments[i].innerHTML; 1405 var tmp = link_attachment.href.replace("javascript:download_attachments(", "").replace(")", ""); 1406 var a_tmp = tmp.split(','); 1407 tmp = link_attachment.innerHTML.substring(0,link_attachment.innerHTML.lastIndexOf("(")); 1408 a_tmp[2] = "'"+tmp.substring(0,tmp.length-1)+"'"; 1409 s_tmp = trim(escape(connector.serialize(a_tmp))); 1410 divOriginalAttachments.innerHTML += "<input style='border:0' type='CHECKBOX' name='forwarding_attachments[]' checked value=\""+s_tmp+"\"/>"; 1411 divOriginalAttachments.appendChild(link_attachment); 1404 if (!is_local) { 1405 var link_attachment = document.createElement("A"); 1406 link_attachment.setAttribute("href", attachments[i].href); 1407 link_attachment.innerHTML = attachments[i].innerHTML; 1408 var tmp = link_attachment.href.replace("javascript:download_attachments(", "").replace(")", ""); 1409 var a_tmp = tmp.split(','); 1410 tmp = link_attachment.innerHTML.substring(0,link_attachment.innerHTML.lastIndexOf("(")); 1411 a_tmp[2] = "'"+tmp.substring(0,tmp.length-1)+"'"; 1412 s_tmp = trim(escape(connector.serialize(a_tmp))); 1413 divOriginalAttachments.innerHTML += "<input style='border:0' type='CHECKBOX' name='forwarding_attachments[]' checked value=\""+s_tmp+"\"/>"; 1414 divOriginalAttachments.appendChild(link_attachment); 1415 } 1416 else { 1417 document.getElementById("is_local_forward"+new_id_border).value = "1"; 1418 var link = attachments[i].href.replace("javascript:download_local_attachment('", "").replace("')", ""); 1419 var name = attachments[i].innerHTML.substring(0, attachments[i].innerHTML.lastIndexOf("(")); 1420 var campo_arquivo = addForwardedFile(new_id_border, name, attachments[i].href, divOriginalAttachments); 1421 expresso_local_messages.getInputFileFromAnexo(campo_arquivo, link); 1422 } 1412 1423 } 1413 1424 }
Note: See TracChangeset
for help on using the changeset viewer.